summaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
Diffstat (limited to 'functions')
-rwxr-xr-xfunctions/defaults.sh13
1 files changed, 11 insertions, 2 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