diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-10-04 14:24:36 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2012-10-04 14:25:01 +0200 |
| commit | 56e4085c60c0b6f4f03d392e43213dc55c971647 (patch) | |
| tree | 956e6fd54e9253611d29ed6e1aac08826c87c056 | |
| parent | 5e1b463cf6a8d2607472a5ecd02c9fcb64e2227d (diff) | |
| download | vyos-live-build-56e4085c60c0b6f4f03d392e43213dc55c971647.tar.gz vyos-live-build-56e4085c60c0b6f4f03d392e43213dc55c971647.zip | |
Making failsafe boot parameters fully customizable like the normal ones.
| -rwxr-xr-x | functions/defaults.sh | 13 | ||||
| -rwxr-xr-x | scripts/build/binary_syslinux | 6 | ||||
| -rw-r--r-- | share/bootloaders/extlinux/live.cfg.in | 2 | ||||
| -rw-r--r-- | share/bootloaders/isolinux/live.cfg.in | 2 | ||||
| -rw-r--r-- | share/bootloaders/pxelinux/live.cfg.in | 2 | ||||
| -rw-r--r-- | share/bootloaders/syslinux/live.cfg.in | 2 |
6 files changed, 18 insertions, 9 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 1fadcd76d..4898817b4 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -990,8 +990,6 @@ Set_defaults () fi # Setting boot parameters - LB_BOOTAPPEND_FAILSAFE="${LB_BOOTAPPEND_FAILSAFE:-memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal}" - # LB_BOOTAPPEND_LIVE case "${LB_MODE}" in ubuntu) @@ -1003,6 +1001,17 @@ Set_defaults () ;; esac + # LB_BOOTAPPEND_LIVE_FAILSAFE + case "${LB_MODE}" in + ubuntu) + LB_BOOTAPPEND_FAILSAFE="${LB_BOOTAPPEND_FAILSAFE:-boot=casper memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal}" + ;; + + *) + LB_BOOTAPPEND_FAILSAFE="${LB_BOOTAPPEND_FAILSAFE:-boot=live config memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal}" + ;; + esac + if [ -n "${LB_DEBIAN_INSTALLER_PRESEEDFILE}" ] then case "${LB_BINARY_IMAGES}" in 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 diff --git a/share/bootloaders/extlinux/live.cfg.in b/share/bootloaders/extlinux/live.cfg.in index 7307eb378..97ceb92a7 100644 --- a/share/bootloaders/extlinux/live.cfg.in +++ b/share/bootloaders/extlinux/live.cfg.in @@ -9,4 +9,4 @@ label live-@FLAVOUR@-failsafe menu label ^Live (@FLAVOUR@ failsafe) linux @LINUX@ initrd @INITRD@ - append @APPEND_LIVE@ @APPEND_FAILSAFE@ + append @APPEND_LIVE_FAILSAFE@ diff --git a/share/bootloaders/isolinux/live.cfg.in b/share/bootloaders/isolinux/live.cfg.in index 7307eb378..97ceb92a7 100644 --- a/share/bootloaders/isolinux/live.cfg.in +++ b/share/bootloaders/isolinux/live.cfg.in @@ -9,4 +9,4 @@ label live-@FLAVOUR@-failsafe menu label ^Live (@FLAVOUR@ failsafe) linux @LINUX@ initrd @INITRD@ - append @APPEND_LIVE@ @APPEND_FAILSAFE@ + append @APPEND_LIVE_FAILSAFE@ diff --git a/share/bootloaders/pxelinux/live.cfg.in b/share/bootloaders/pxelinux/live.cfg.in index 7307eb378..97ceb92a7 100644 --- a/share/bootloaders/pxelinux/live.cfg.in +++ b/share/bootloaders/pxelinux/live.cfg.in @@ -9,4 +9,4 @@ label live-@FLAVOUR@-failsafe menu label ^Live (@FLAVOUR@ failsafe) linux @LINUX@ initrd @INITRD@ - append @APPEND_LIVE@ @APPEND_FAILSAFE@ + append @APPEND_LIVE_FAILSAFE@ diff --git a/share/bootloaders/syslinux/live.cfg.in b/share/bootloaders/syslinux/live.cfg.in index 7307eb378..97ceb92a7 100644 --- a/share/bootloaders/syslinux/live.cfg.in +++ b/share/bootloaders/syslinux/live.cfg.in @@ -9,4 +9,4 @@ label live-@FLAVOUR@-failsafe menu label ^Live (@FLAVOUR@ failsafe) linux @LINUX@ initrd @INITRD@ - append @APPEND_LIVE@ @APPEND_FAILSAFE@ + append @APPEND_LIVE_FAILSAFE@ |