diff options
| author | Daniel Baumann <daniel@debian.org> | 2009-12-13 21:17:45 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:17:03 +0100 |
| commit | 701b5affd403d9a25df311fc422dd33eb4526c34 (patch) | |
| tree | 7e7cc9f57ceb0d3700ee13541944efb044ae9d60 /helpers/lh_binary_silo | |
| parent | 32930b4a6a14374d2895a4e9247fdc192a91124b (diff) | |
| download | live-build-701b5affd403d9a25df311fc422dd33eb4526c34.zip live-build-701b5affd403d9a25df311fc422dd33eb4526c34.tar.gz | |
For consistency, using true|false instead of enabled|disabled in configuration options.
Diffstat (limited to 'helpers/lh_binary_silo')
| -rwxr-xr-x | helpers/lh_binary_silo | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/helpers/lh_binary_silo b/helpers/lh_binary_silo index 5dd7680..d79d0b7 100755 --- a/helpers/lh_binary_silo +++ b/helpers/lh_binary_silo @@ -123,7 +123,7 @@ mkdir -p "${DESTDIR_LIVE}" # Setting boot parameters case "${LH_ENCRYPTION}" in - ""|disabled) + ""|false) ;; *) LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}" @@ -173,7 +173,7 @@ then exit 1 fi -if [ "${LH_EXPOSED_ROOT}" != "disabled" ] +if [ "${LH_EXPOSED_ROOT}" != "false" ] then LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} exposedroot" fi @@ -209,7 +209,7 @@ fi LINUX_LIVE="$(/bin/echo ${LINUX_LIVE} | sed -e 's|binary||g' -e 's|//|/|g')" # Assembling debian-installer configuration -if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ] +if [ "${LH_DEBIAN_INSTALLER}" != "false" ] then VMLINUZ_DI="vmlinuz" INITRD_DI="initrd.gz" @@ -230,18 +230,18 @@ case "${LH_BINARY_IMAGES}" in mkdir -p binary/boot case "${LH_CHROOT_BUILD}" in - enabled) + true) cp chroot/boot/second.b binary/boot ;; - disabled) + false) cp /boot/second.b binary/boot ;; esac cp -r "${TEMPLATES}"/* binary/boot - if [ "${LH_DEBIAN_INSTALLER}" = "disabled" ] + if [ "${LH_DEBIAN_INSTALLER}" = "false" ] then rm -f binary/boot/debian.txt.install else |