diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-10-04 14:24:36 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2012-10-04 14:25:01 +0200 |
| commit | 56e4085c60c0b6f4f03d392e43213dc55c971647 (patch) | |
| tree | 956e6fd54e9253611d29ed6e1aac08826c87c056 /functions | |
| parent | 5e1b463cf6a8d2607472a5ecd02c9fcb64e2227d (diff) | |
| download | vyos-live-build-56e4085c60c0b6f4f03d392e43213dc55c971647.tar.gz vyos-live-build-56e4085c60c0b6f4f03d392e43213dc55c971647.zip | |
Making failsafe boot parameters fully customizable like the normal ones.
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/defaults.sh | 13 |
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 |