Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix sed delimiters in various scripts 

Found by Steev - "," is not a safe delimiter to use in various
places. Switch to "|" instead.
This commit is contained in:
Steve McIntyre 2021-01-16 15:26:02 +00:00
parent 7bf72e1306
commit e751f6f630
9 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -17,6 +17,7 @@ debian-cd (3.1.26-buster) UNRELEASED; urgency=medium
parallel.
+ tools/make_disc_trees.pl: When compressing translations, remove
the uncompressed version
+ Fix sed delimiters in various scripts
-- Samuel Thibault <sthibault@debian.org> Fri, 23 Aug 2019 21:51:50 +0200

4
tools/boot/bullseye/boot-arm64
View File

@ -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"

4
tools/boot/bullseye/boot-armhf
View File

@ -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"

4
tools/boot/bullseye/boot-ia64
View File

@ -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"

4
tools/boot/buster/boot-arm64
View File

@ -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"

4
tools/boot/buster/boot-armhf
View File

@ -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"

4
tools/boot/buster/boot-ia64
View File

@ -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"

2
tools/boot/jessie/boot-arm64
View File

@ -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"

4
tools/boot/stretch/boot-arm64
View File

@ -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"