From 84dcf4ed028ddfe27e291efeb35f49064314473a Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 4 Oct 2012 14:26:44 +0200 Subject: Making different boot options defaults depending on initramfs generator, not depending on mode. --- functions/defaults.sh | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'functions/defaults.sh') diff --git a/functions/defaults.sh b/functions/defaults.sh index 4898817b4..1860618cc 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -990,25 +990,31 @@ Set_defaults () fi # Setting boot parameters - # LB_BOOTAPPEND_LIVE - case "${LB_MODE}" in - ubuntu) + case "${LB_INITRAMFS}" in + live-boot) + LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE:-boot=live config quiet splash}" + ;; + + casper) LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE:-boot=casper quiet splash}" ;; *) - LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE:-boot=live config quiet splash}" + LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE:-quiet splash}" ;; esac - # LB_BOOTAPPEND_LIVE_FAILSAFE - case "${LB_MODE}" in - ubuntu) + case "${LB_INITRAMFS}" in + live-boot) + LB_BOOTAPPEND_FAILSAFE="${LB_BOOTAPPEND_FAILSAFE:-boot=live config memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal}" + ;; + + casper) 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}" + LB_BOOTAPPEND_FAILSAFE="${LB_BOOTAPPEND_FAILSAFE:-memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal}" ;; esac -- cgit v1.2.3