diff options
| author | Chris Lamb <chris@chris-lamb.co.uk> | 2008-03-23 04:21:47 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:03:29 +0100 |
| commit | 55472e65570b2ebd33a0bd9ca4aebfb0cad203e4 (patch) | |
| tree | ea6372cd9bcf9b5597584772e9bc671968f67b6c /functions | |
| parent | 13625df75ce06441df9c8e19d104c4fabf69bafe (diff) | |
| download | live-build-55472e65570b2ebd33a0bd9ca4aebfb0cad203e4.zip live-build-55472e65570b2ebd33a0bd9ca4aebfb0cad203e4.tar.gz | |
Allow LH_ENCRYPTION="disabled" to disable encryption
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/defaults.sh | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 70aa6f2..4023fa6 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -430,10 +430,13 @@ Set_defaults () fi fi - if [ -n "${LH_ENCRYPTION}" ] - then - LH_LINUX_PACKAGES="${LH_LINUX_PACKAGES} loop-aes-modules-2.6" - fi + case "${LH_ENCRYPTION}" in + ""|disabled) + ;; + *) + LH_LINUX_PACKAGES="${LH_LINUX_PACKAGES} loop-aes-modules-2.6" + ;; + esac fi # Setting packages string @@ -529,7 +532,7 @@ Set_defaults () LH_DEBIAN_INSTALLER_DAILY="${LH_DEBIAN_INSTALLER_DAILY:-disabled}" # Setting encryption - # LH_ENCRYPTION + LH_ENCRYPTION="${LH_ENCRYPTION:-disabled}" # Setting grub splash # LH_GRUB_SPLASH |