diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-10-04 14:26:44 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2012-10-04 14:26:44 +0200 |
| commit | 84dcf4ed028ddfe27e291efeb35f49064314473a (patch) | |
| tree | c218c7b365449bf55cd087a3f71ffccfdb6305b6 | |
| parent | 56e4085c60c0b6f4f03d392e43213dc55c971647 (diff) | |
| download | vyos-live-build-84dcf4ed028ddfe27e291efeb35f49064314473a.tar.gz vyos-live-build-84dcf4ed028ddfe27e291efeb35f49064314473a.zip | |
Making different boot options defaults depending on initramfs generator, not depending on mode.
| -rwxr-xr-x | functions/defaults.sh | 22 |
1 files changed, 14 insertions, 8 deletions
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 |