diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-10-08 20:01:30 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-10-08 20:01:30 +0200 |
| commit | 5f7780597e9b878458824fb8d93f0a9e62935ed1 (patch) | |
| tree | 42d449bf80c5be07bbfb50c80298601d0f38d031 /functions | |
| parent | a7227d4ebcc16d13a6e80c5f394d856f0bfd64a0 (diff) | |
| download | vyos-live-build-5f7780597e9b878458824fb8d93f0a9e62935ed1.tar.gz vyos-live-build-5f7780597e9b878458824fb8d93f0a9e62935ed1.zip | |
Simplifying bootparameter assembling in defaults.
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/defaults.sh | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index b8c4d67fc..3a43071be 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -969,27 +969,16 @@ Set_defaults () 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}" - ;; - - none) - LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE:-quiet splash}" - ;; - esac - - 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_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}" ;; 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}" ;; esac |