diff options
| author | Daniel Baumann <daniel@debian.org> | 2009-02-01 11:51:51 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:09:41 +0100 |
| commit | 68d4026b09ad7d36136ab2eba58064e0548c6b99 (patch) | |
| tree | f754040c9a2ed65b6c4a119e35a98703f3b50f27 | |
| parent | 285b6ed834f37185e05785984f9d277837823444 (diff) | |
| download | live-build-68d4026b09ad7d36136ab2eba58064e0548c6b99.zip live-build-68d4026b09ad7d36136ab2eba58064e0548c6b99.tar.gz | |
Correcting wrong logic in defaults.sh which resultet in having loop-aes-utils always installed.
| -rwxr-xr-x | functions/defaults.sh | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 973bfc0..f823b18 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -476,10 +476,17 @@ Set_defaults () # Setting packages string # LH_PACKAGES - if [ -z "${LH_PACKAGES}" ] && [ "${LH_ENCRYPTION}" != "disabled" ] - then - LH_PACKAGES="loop-aes-utils" - fi + case "${LH_ENCRYPTION}" in + ""|disabled) + ;; + + *) + if ! In_list loop-aes-utils "${LH_PACKAGES}" + then + LH_PACKAGES="${LH_PACKAGES} loop-aes-utils" + fi + ;; + esac # Setting packages list string LH_PACKAGES_LISTS="${LH_PACKAGES_LISTS:-standard}" |