diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2015-05-03 15:49:57 +0200 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2015-05-03 15:50:03 +0200 |
| commit | f93e83e351193a93c0a529798f7d01997c9d0909 (patch) | |
| tree | 0c3e3f208ece70f489b7cada15629f9b392a611f /functions/defaults.sh | |
| parent | d18cb12cc1904ce9c575b88bf2403ec70ce2c90e (diff) | |
| download | vyos-live-build-f93e83e351193a93c0a529798f7d01997c9d0909.tar.gz vyos-live-build-f93e83e351193a93c0a529798f7d01997c9d0909.zip | |
Dropping automagics for casper.
Future live-build versions will still allow to use casper,
but its configuration will be done differently by hooks
in the config tree, rather than embedded and maintenance intensive
code in live-build itself.
Diffstat (limited to 'functions/defaults.sh')
| -rwxr-xr-x | functions/defaults.sh | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 5f93f4ac0..4598ec662 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -234,15 +234,7 @@ Set_defaults () # Setting initramfs hook case "${LB_SYSTEM}" in live) - case "${LB_MODE}" in - ubuntu) - LB_INITRAMFS="${LB_INITRAMFS:-casper}" - ;; - - *) - LB_INITRAMFS="${LB_INITRAMFS:-live-boot}" - ;; - esac + LB_INITRAMFS="${LB_INITRAMFS:-live-boot}" ;; normal) @@ -751,11 +743,6 @@ Set_defaults () LB_BOOTAPPEND_LIVE_FAILSAFE="${LB_BOOTAPPEND_LIVE_FAILSAFE:-boot=live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal}" ;; - casper) - LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE:-boot=casper quiet splash}" - LB_BOOTAPPEND_LIVE_FAILSAFE="${LB_BOOTAPPEND_LIVE_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_LIVE_FAILSAFE="${LB_BOOTAPPEND_LIVE_FAILSAFE:-memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal}" |