diff --git a/debian/changelog b/debian/changelog index f5405c9a..0e9abd83 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,9 @@ debian-cd (3.1.32) UNRELEASED; urgency=medium * tasks/bullseye/Debian-edu-full: Add winbind, freeradius and freeradius-krb5 packages. + [ Steev Klimaszewski ] + * Fix sed delimiters in various scripts + -- Steve McIntyre <93sam@debian.org> sat, 12 Dec 2020 03:12:36 +0100 debian-cd (3.1.31) unstable; urgency=medium diff --git a/tools/boot/bullseye/boot-arm64 b/tools/boot/bullseye/boot-arm64 index a52018cb..d954dff3 100755 --- a/tools/boot/bullseye/boot-arm64 +++ b/tools/boot/bullseye/boot-arm64 @@ -126,10 +126,10 @@ if [ -d boot$N/grub ] ; then # Finally, belt and braces - fix up the %install% entries in grub # in case they're still there - sed -i "s,\%install\%,$INSTALLDIR,g" $CDDIR/boot/grub/grub.cfg + sed -i "s|\%install\%|$INSTALLDIR|g" $CDDIR/boot/grub/grub.cfg # Substitute custom KERNEL_PARAMS into grub.cfg - sed -i "s,/vmlinuz ,/vmlinuz $KERNEL_PARAMS ,g" $CDDIR/boot/grub/grub.cfg + sed -i "s|/vmlinuz |/vmlinuz $KERNEL_PARAMS |g" $CDDIR/boot/grub/grub.cfg else echo " No EFI boot code for $ARCH on CD$N" diff --git a/tools/boot/bullseye/boot-armhf b/tools/boot/bullseye/boot-armhf index 43e96966..8ff8fdcc 100755 --- a/tools/boot/bullseye/boot-armhf +++ b/tools/boot/bullseye/boot-armhf @@ -125,10 +125,10 @@ if [ -d boot$N/grub ] ; then # Finally, belt and braces - fix up the %install% entries in grub # in case they're still there - sed -i "s,\%install\%,$INSTALLDIR,g" $CDDIR/boot/grub/grub.cfg + sed -i "s|\%install\%|$INSTALLDIR|g" $CDDIR/boot/grub/grub.cfg # Substitute custom KERNEL_PARAMS into grub.cfg - sed -i "s,/vmlinuz ,/vmlinuz $KERNEL_PARAMS ,g" $CDDIR/boot/grub/grub.cfg + sed -i "s|/vmlinuz |/vmlinuz $KERNEL_PARAMS |g" $CDDIR/boot/grub/grub.cfg else echo " No EFI boot code for $ARCH on CD$N" diff --git a/tools/boot/bullseye/boot-ia64 b/tools/boot/bullseye/boot-ia64 index 0e73cd86..d8c42ae3 100755 --- a/tools/boot/bullseye/boot-ia64 +++ b/tools/boot/bullseye/boot-ia64 @@ -122,10 +122,10 @@ if [ -d boot$N/grub ] ; then # Finally, belt and braces - fix up the %install% entries in grub # in case they're still there - sed -i "s,\%install\%,$INSTALLDIR,g" $CDDIR/boot/grub/grub.cfg + sed -i "s|\%install\%|$INSTALLDIR|g" $CDDIR/boot/grub/grub.cfg # Substitute custom KERNEL_PARAMS into grub.cfg - sed -i "s,/vmlinuz ,/vmlinuz $KERNEL_PARAMS ,g" $CDDIR/boot/grub/grub.cfg + sed -i "s|/vmlinuz |/vmlinuz $KERNEL_PARAMS |g" $CDDIR/boot/grub/grub.cfg else echo " No EFI boot code for $ARCH on CD$N" diff --git a/tools/boot/buster/boot-arm64 b/tools/boot/buster/boot-arm64 index 67dda5a3..c041b63f 100755 --- a/tools/boot/buster/boot-arm64 +++ b/tools/boot/buster/boot-arm64 @@ -122,10 +122,10 @@ if [ -d boot$N/grub ] ; then # Finally, belt and braces - fix up the %install% entries in grub # in case they're still there - sed -i "s,\%install\%,$INSTALLDIR,g" $CDDIR/boot/grub/grub.cfg + sed -i "s|\%install\%|$INSTALLDIR|g" $CDDIR/boot/grub/grub.cfg # Substitute custom KERNEL_PARAMS into grub.cfg - sed -i "s,/vmlinuz ,/vmlinuz $KERNEL_PARAMS ,g" $CDDIR/boot/grub/grub.cfg + sed -i "s|/vmlinuz |/vmlinuz $KERNEL_PARAMS |g" $CDDIR/boot/grub/grub.cfg else echo " No EFI boot code for $ARCH on CD$N" diff --git a/tools/boot/buster/boot-armhf b/tools/boot/buster/boot-armhf index 43e96966..8ff8fdcc 100755 --- a/tools/boot/buster/boot-armhf +++ b/tools/boot/buster/boot-armhf @@ -125,10 +125,10 @@ if [ -d boot$N/grub ] ; then # Finally, belt and braces - fix up the %install% entries in grub # in case they're still there - sed -i "s,\%install\%,$INSTALLDIR,g" $CDDIR/boot/grub/grub.cfg + sed -i "s|\%install\%|$INSTALLDIR|g" $CDDIR/boot/grub/grub.cfg # Substitute custom KERNEL_PARAMS into grub.cfg - sed -i "s,/vmlinuz ,/vmlinuz $KERNEL_PARAMS ,g" $CDDIR/boot/grub/grub.cfg + sed -i "s|/vmlinuz |/vmlinuz $KERNEL_PARAMS |g" $CDDIR/boot/grub/grub.cfg else echo " No EFI boot code for $ARCH on CD$N" diff --git a/tools/boot/buster/boot-ia64 b/tools/boot/buster/boot-ia64 index 0e73cd86..d8c42ae3 100755 --- a/tools/boot/buster/boot-ia64 +++ b/tools/boot/buster/boot-ia64 @@ -122,10 +122,10 @@ if [ -d boot$N/grub ] ; then # Finally, belt and braces - fix up the %install% entries in grub # in case they're still there - sed -i "s,\%install\%,$INSTALLDIR,g" $CDDIR/boot/grub/grub.cfg + sed -i "s|\%install\%|$INSTALLDIR|g" $CDDIR/boot/grub/grub.cfg # Substitute custom KERNEL_PARAMS into grub.cfg - sed -i "s,/vmlinuz ,/vmlinuz $KERNEL_PARAMS ,g" $CDDIR/boot/grub/grub.cfg + sed -i "s|/vmlinuz |/vmlinuz $KERNEL_PARAMS |g" $CDDIR/boot/grub/grub.cfg else echo " No EFI boot code for $ARCH on CD$N" diff --git a/tools/boot/jessie/boot-arm64 b/tools/boot/jessie/boot-arm64 index fd736abf..cba5ba99 100755 --- a/tools/boot/jessie/boot-arm64 +++ b/tools/boot/jessie/boot-arm64 @@ -126,7 +126,7 @@ if [ -d boot$N/grub ] ; then # Finally, belt and braces - fix up the %install% entries in grub # in case they're still there - sed -i "s,\%install\%,$INSTALLDIR,g" $CDDIR/boot/grub/grub.cfg + sed -i "s|\%install\%|$INSTALLDIR|g" $CDDIR/boot/grub/grub.cfg else echo " No EFI boot code for $ARCH on CD$N" diff --git a/tools/boot/stretch/boot-arm64 b/tools/boot/stretch/boot-arm64 index d00b5f2e..f4ee5694 100755 --- a/tools/boot/stretch/boot-arm64 +++ b/tools/boot/stretch/boot-arm64 @@ -153,10 +153,10 @@ if [ -d boot$N/grub ] ; then # Finally, belt and braces - fix up the %install% entries in grub # in case they're still there - sed -i "s,\%install\%,$INSTALLDIR,g" $CDDIR/boot/grub/grub.cfg + sed -i "s|\%install\%|$INSTALLDIR|g" $CDDIR/boot/grub/grub.cfg # Substitute custom KERNEL_PARAMS into grub.cfg - sed -i "s,/vmlinuz ,/vmlinuz $KERNEL_PARAMS ,g" $CDDIR/boot/grub/grub.cfg + sed -i "s|/vmlinuz |/vmlinuz $KERNEL_PARAMS |g" $CDDIR/boot/grub/grub.cfg else echo " No EFI boot code for $ARCH on CD$N"