summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-10-08 20:16:40 +0200
committerDaniel Baumann <daniel@debian.org>2012-10-08 20:16:40 +0200
commitdd43976fb7e6c75b2bfedb0b88d8857312c07864 (patch)
treea1f12afc15e6bb55ac910081ef82bedd0067e605
parent5f7780597e9b878458824fb8d93f0a9e62935ed1 (diff)
downloadvyos-live-build-dd43976fb7e6c75b2bfedb0b88d8857312c07864.tar.gz
vyos-live-build-dd43976fb7e6c75b2bfedb0b88d8857312c07864.zip
Correcting variable handling for --bootappend-live-failsafe in defaults.
-rwxr-xr-xfunctions/defaults.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 3a43071be..e430fa61d 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -969,17 +969,17 @@ Set_defaults ()
case "${LB_INITRAMFS}" in
live-boot)
LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE:-boot=live config quiet splash}"
- LB_BOOTAPPEND_FAILSAFE="${LB_BOOTAPPEND_FAILSAFE:-boot=live config memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal}"
+ LB_BOOTAPPEND_LIVE_FAILSAFE="${LB_BOOTAPPEND_LIVE_FAILSAFE:-boot=live config memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal}"
;;
casper)
LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE:-boot=casper quiet splash}"
- LB_BOOTAPPEND_FAILSAFE="${LB_BOOTAPPEND_FAILSAFE:-boot=casper memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal}"
+ LB_BOOTAPPEND_LIVE_FAILSAFE="${LB_BOOTAPPEND_LIVE_FAILSAFE:-boot=casper memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal}"
;;
none)
LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE:-quiet splash}"
- LB_BOOTAPPEND_FAILSAFE="${LB_BOOTAPPEND_FAILSAFE:-memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal}"
+ LB_BOOTAPPEND_LIVE_FAILSAFE="${LB_BOOTAPPEND_LIVE_FAILSAFE:-memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal}"
;;
esac