From d94e9eb5b727a1b610d81577faffc7c371631e0c Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sun, 29 Jan 2023 22:03:55 +0100 Subject: [PATCH] Fix missing %install% replacements E.g. the ontimeout line of spkgtk.cfg includes both the kernel and initrd paths on the same line, so need several %install% replacements. --- tools/boot/bookworm/boot-x86 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/boot/bookworm/boot-x86 b/tools/boot/bookworm/boot-x86 index 1ded5bc0..fd955651 100644 --- a/tools/boot/bookworm/boot-x86 +++ b/tools/boot/bookworm/boot-x86 @@ -313,7 +313,7 @@ fi if [ -z "$MULTIARCH" ]; then # Set up isolinux dir for only the current arch - grep -lr '%install%' boot$N/isolinux/* | xargs -r sed -i "s|%install%|$INSTALLDIR|" + grep -lr '%install%' boot$N/isolinux/* | xargs -r sed -i "s|%install%|$INSTALLDIR|g" # Remove the x86*.cfg files to avoid them being loaded on a disc # that does not have both amd64 and i386 dirs. @@ -324,8 +324,8 @@ else # Set up isolinux dir for multi-arch grep -lr '%install[-x86]*%' boot$N/isolinux/* | \ - xargs -r sed -i -e "s|%install%|$INSTALLDIR_amd64|" \ - -e "s|%install-x86%|$INSTALLDIR_i386|" + xargs -r sed -i -e "s|%install%|$INSTALLDIR_amd64|g" \ + -e "s|%install-x86%|$INSTALLDIR_i386|g" for file in boot$N/isolinux/f3.txt* boot$N/isolinux/f4.txt*; do sed -i "4 s/^$/(note: amd64 is default; prepend 'x86-' to use an i386 kernel instead)/" $file