Using hash rather than pipe as sed separator for writing boot parameters into bootloa...
authorDaniel Baumann <daniel@debian.org>
Fri, 30 Nov 2012 14:06:57 +0000 (15:06 +0100)
committerDaniel Baumann <daniel@debian.org>
Fri, 30 Nov 2012 14:06:57 +0000 (15:06 +0100)
scripts/build/binary_grub
scripts/build/binary_grub2
scripts/build/binary_silo
scripts/build/binary_syslinux
scripts/build/binary_yaboot

index af63722..cef3da7 100755 (executable)
@@ -264,7 +264,7 @@ fi
 cp ${FILES} binary/boot/grub
 
 sed -i -e "s|LINUX_LIVE|${LINUX_LIVE}|" -e "s|LINUX_INSTALL|${LINUX_INSTALL}|" -e "s|MEMTEST|${MEMTEST}|" binary/boot/grub/menu.lst
-sed -i -e "s|LB_BOOTAPPEND_INSTALL|${LB_BOOTAPPEND_INSTALL}|" -e "s|LB_BOOTAPPEND_LIVE|${LB_BOOTAPPEND_LIVE}|" binary/boot/grub/menu.lst
+sed -i -e "s#LB_BOOTAPPEND_INSTALL#${LB_BOOTAPPEND_INSTALL}#" -e "s#LB_BOOTAPPEND_LIVE#${LB_BOOTAPPEND_LIVE}#" binary/boot/grub/menu.lst
 
 sed -i -e 's|\ $||g' binary/boot/grub/menu.lst
 
index ce1d153..1b77523 100755 (executable)
@@ -237,7 +237,7 @@ fi
 cp ${FILES} binary/boot/grub
 
 sed -i -e "s|LINUX_LIVE|${LINUX_LIVE}|" -e "s|LINUX_INSTALL|${LINUX_INSTALL}|" -e "s|MEMTEST|${MEMTEST}|" binary/boot/grub/grub.cfg
-sed -i -e "s|LB_BOOTAPPEND_INSTALL|${LB_BOOTAPPEND_INSTALL}|" -e "s|LB_BOOTAPPEND_LIVE|${LB_BOOTAPPEND_LIVE}|" binary/boot/grub/grub.cfg
+sed -i -e "s#LB_BOOTAPPEND_INSTALL#${LB_BOOTAPPEND_INSTALL}#" -e "s#LB_BOOTAPPEND_LIVE#${LB_BOOTAPPEND_LIVE}#" binary/boot/grub/grub.cfg
 
 sed -i -e 's|\ $||g' binary/boot/grub/grub.cfg
 
index b1ec175..8e833d1 100755 (executable)
@@ -219,8 +219,8 @@ case "${LB_BINARY_IMAGES}" in
                sed -i -e "s|LINUX_LIVE|${LINUX_LIVE}|" \
                       -e "s|LINUX_INSTALL|${LINUX_INSTALL}|" \
                       binary/boot/silo.conf
-               sed -i -e "s|LB_BOOTAPPEND_INSTALL|${LB_BOOTAPPEND_INSTALL}|" \
-                      -e "s|LB_BOOTAPPEND_LIVE|${LB_BOOTAPPEND_LIVE}|" \
+               sed -i -e "s#LB_BOOTAPPEND_INSTALL#${LB_BOOTAPPEND_INSTALL}#" \
+                      -e "s#LB_BOOTAPPEND_LIVE#${LB_BOOTAPPEND_LIVE}#" \
                       binary/boot/silo.conf
                sed -i -e "s|LB_DATE|$(date +%Y%m%d)|" \
                       -e "s|LB_VERSION|${VERSION}|" \
index 5836b0a..7f1bf86 100755 (executable)
@@ -221,8 +221,8 @@ then
                        sed -e "s|@FLAVOUR@|${LB_LINUX_FLAVOURS}|g" \
                            -e "s|@LINUX@|/live/vmlinuz|g" \
                            -e "s|@INITRD@|/live/initrd.img|g" \
-                           -e "s|@APPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|g" \
-                           -e "s|@APPEND_LIVE_FAILSAFE@|${LB_BOOTAPPEND_LIVE_FAILSAFE}|g" \
+                           -e "s#@APPEND_LIVE@#${LB_BOOTAPPEND_LIVE}#g" \
+                           -e "s#@APPEND_LIVE_FAILSAFE@#${LB_BOOTAPPEND_LIVE_FAILSAFE}#g" \
                        "${_TARGET}/live.cfg.in" >> "${_TARGET}/live.cfg"
 
                        rm -f "${_TARGET}/live.cfg.in"
@@ -249,8 +249,8 @@ then
                                sed -i -e "s|@FLAVOUR@|${_FLAVOUR}|g" \
                                       -e "s|@LINUX@|/live/vmlinuz${_NUMBER}|g" \
                                       -e "s|@INITRD@|/live/initrd${_NUMBER}.img|g" \
-                                      -e "s|@APPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|g" \
-                                      -e "s|@APPEND_LIVE_FAILSAFE@|${LB_BOOTAPPEND_LIVE_FAILSAFE}|g" \
+                                      -e "s#@APPEND_LIVE@#${LB_BOOTAPPEND_LIVE}#g" \
+                                      -e "s#@APPEND_LIVE_FAILSAFE@#${LB_BOOTAPPEND_LIVE_FAILSAFE}#g" \
                                "${_TARGET}/live.cfg"
                        done
 
@@ -259,14 +259,14 @@ then
        esac
 elif [ -e "${_TARGET}/live.cfg" ]
 then
-       sed -i  -e "s|@LB_BOOTAPPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|g" \
-               -e "s|@LB_BOOTAPPEND_LIVE_FAILSAFE@|${LB_BOOTAPPEND_LIVE_FAILSAFE}|g" \
+       sed -i  -e "s#@LB_BOOTAPPEND_LIVE@#${LB_BOOTAPPEND_LIVE}#g" \
+               -e "s#@LB_BOOTAPPEND_LIVE_FAILSAFE@#${LB_BOOTAPPEND_LIVE_FAILSAFE}#g" \
        ${_TARGET}/live.cfg
 fi
 
 if [ -e ${_TARGET}/install.cfg ]
 then
-       sed -i -e "s|@LB_BOOTAPPEND_INSTALL@|${LB_BOOTAPPEND_INSTALL}|g" \
+       sed -i -e "s#@LB_BOOTAPPEND_INSTALL@#${LB_BOOTAPPEND_INSTALL}#g" \
        ${_TARGET}/install.cfg
 fi
 
index 4838cf3..8fc5a64 100755 (executable)
@@ -269,7 +269,7 @@ case "${LB_BINARY_IMAGES}" in
 
                # Configure yaboot templates
                sed -i -e "s|LINUX_LIVE|${LINUX_LIVE}|" -e "s|LINUX_INSTALL|${LINUX_INSTALL}|" binary/yaboot/yaboot.conf
-               sed -i -e "s|LB_BOOTAPPEND_INSTALL|${LB_BOOTAPPEND_INSTALL}|" -e "s|LB_BOOTAPPEND_LIVE|${LB_BOOTAPPEND_LIVE}|" binary/yaboot/yaboot.conf
+               sed -i -e "s#LB_BOOTAPPEND_INSTALL#${LB_BOOTAPPEND_INSTALL}#" -e "s#LB_BOOTAPPEND_LIVE#${LB_BOOTAPPEND_LIVE}#" binary/yaboot/yaboot.conf
                sed -i -e "s|LB_DATE|$(date +%Y%m%d)|" -e "s|LB_VERSION|${VERSION}|" binary/yaboot/boot.msg
                ;;
 esac