diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-04-27 20:31:49 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-04-27 20:31:49 +0200 |
| commit | 58cb79b8cdfe7b2dce672b033d75d5fc1461851b (patch) | |
| tree | a20032b8cad7b9b9eec5b834dae71ef109450179 /scripts/build/lb_binary_silo | |
| parent | 4b333fb98091936fe0cd805e3164e31a4759d810 (diff) | |
| download | vyos-live-build-58cb79b8cdfe7b2dce672b033d75d5fc1461851b.tar.gz vyos-live-build-58cb79b8cdfe7b2dce672b033d75d5fc1461851b.zip | |
Transforming failsafe boot parameter into an own option.
Diffstat (limited to 'scripts/build/lb_binary_silo')
| -rwxr-xr-x | scripts/build/lb_binary_silo | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/scripts/build/lb_binary_silo b/scripts/build/lb_binary_silo index 05f35d62e..90c445f2b 100755 --- a/scripts/build/lb_binary_silo +++ b/scripts/build/lb_binary_silo @@ -146,9 +146,6 @@ fi LB_BOOTAPPEND_LIVE="$(echo ${LB_BOOTAPPEND_LIVE} | sed -e 's| ||')" -# Parameters are listed at: linux/Documentation/kernel-parameters.txt -FAILSAFE="memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=ofonly" - # Assembling kernel configuration # Default entries @@ -157,7 +154,11 @@ DEFAULT_KERNEL="$(basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR})" DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e 's|vmlinuz-||')" Silo_live_entry "live" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}" -Silo_live_entry "live-failsafe" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}" "${FAILSAFE}" + +if [ "${LB_BOOTAPPEND_FAILSAFE}" != "none" ] +then + Silo_live_entry "live-failsafe" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}" "${LB_BOOTAPPEND_FAILSAFE}" +fi if [ "$(echo ${LB_LINUX_FLAVOURS} | wc -w)" -gt "1" ] then @@ -168,7 +169,7 @@ then INITRD="initrd.img-${KERNEL_VERSION}" Silo_live_entry "live-${KERNEL_VERSION}" "${KERNEL_IMAGE}" "${INITRD}" - Silo_live_entry "live-${KERNEL_VERSION}-failsafe" "${KERNEL_IMAGE}" "${INITRD}" "${FAILSAFE}" + Silo_live_entry "live-${KERNEL_VERSION}-failsafe" "${KERNEL_IMAGE}" "${INITRD}" "${LB_BOOTAPPEND_FAILSAFE}" done fi |