mirror of
https://salsa.debian.org/images-team/debian-cd.git
synced 2024-11-24 15:19:51 -01:00
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:
parent
7bf72e1306
commit
e751f6f630
1
debian/changelog
vendored
1
debian/changelog
vendored
@ -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
|
||||
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user