diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-11-30 15:06:57 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-11-30 15:06:57 +0100 |
| commit | 2df809705d670993096e841173f565323d93da8a (patch) | |
| tree | fbe16f8aeb4a4ed91f5f80b4b95eb6591a49cd3c /scripts/build/binary_syslinux | |
| parent | 8affdd79d0c1e316e5ab3dc87df3caaea4b202ce (diff) | |
| download | vyos-live-build-2df809705d670993096e841173f565323d93da8a.tar.gz vyos-live-build-2df809705d670993096e841173f565323d93da8a.zip | |
Using hash rather than pipe as sed separator for writing boot parameters into bootloader configurations (Closes: #694723).
Diffstat (limited to 'scripts/build/binary_syslinux')
| -rwxr-xr-x | scripts/build/binary_syslinux | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux index 5836b0a26..7f1bf86f7 100755 --- a/scripts/build/binary_syslinux +++ b/scripts/build/binary_syslinux @@ -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 |