summaryrefslogtreecommitdiff
path: root/scripts/build
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-10-04 14:24:36 +0200
committerDaniel Baumann <daniel.baumann@progress-linux.org>2012-10-04 14:25:01 +0200
commit56e4085c60c0b6f4f03d392e43213dc55c971647 (patch)
tree956e6fd54e9253611d29ed6e1aac08826c87c056 /scripts/build
parent5e1b463cf6a8d2607472a5ecd02c9fcb64e2227d (diff)
downloadvyos-live-build-56e4085c60c0b6f4f03d392e43213dc55c971647.tar.gz
vyos-live-build-56e4085c60c0b6f4f03d392e43213dc55c971647.zip
Making failsafe boot parameters fully customizable like the normal ones.
Diffstat (limited to 'scripts/build')
-rwxr-xr-xscripts/build/binary_syslinux6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux
index b891db0f3..7c6c20c75 100755
--- a/scripts/build/binary_syslinux
+++ b/scripts/build/binary_syslinux
@@ -222,7 +222,7 @@ then
-e "s|@LINUX@|/live/vmlinuz|g" \
-e "s|@INITRD@|/live/initrd.img|g" \
-e "s|@APPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|g" \
- -e "s|@APPEND_FAILSAFE@|${LB_BOOTAPPEND_FAILSAFE}|g" \
+ -e "s|@APPEND_LIVE_FAILSAFE@|${LB_BOOTAPPEND_LIVE_FAILSAFE}|g" \
"${_TARGET}/live.cfg.in" >> "${_TARGET}/live.cfg"
rm -f "${_TARGET}/live.cfg.in"
@@ -250,7 +250,7 @@ then
-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_FAILSAFE@|${LB_BOOTAPPEND_FAILSAFE}|g" \
+ -e "s|@APPEND_LIVE_FAILSAFE@|${LB_BOOTAPPEND_LIVE_FAILSAFE}|g" \
"${_TARGET}/live.cfg"
done
@@ -260,7 +260,7 @@ then
elif [ -e "${_TARGET}/live.cfg" ]
then
sed -i -e "s|@LB_BOOTAPPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|g" \
- -e "s|@LB_BOOTAPPEND_FAILSAFE@|${LB_BOOTAPPEND_FAILSAFE}|g" \
+ -e "s|@LB_BOOTAPPEND_LIVE_FAILSAFE@|${LB_BOOTAPPEND_LIVE_FAILSAFE}|g" \
${_TARGET}/live.cfg
fi