From 701b5affd403d9a25df311fc422dd33eb4526c34 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 13 Dec 2009 21:17:45 +0100 Subject: For consistency, using true|false instead of enabled|disabled in configuration options. --- debian/live-helper.cron.daily | 6 +- debian/live-helper.default | 4 +- examples/cron/images.sh | 12 ++-- functions/arguments.sh | 10 ++-- functions/breakpoints.sh | 2 +- functions/cache.sh | 4 +- functions/chroot.sh | 2 +- functions/defaults.sh | 86 +++++++++++++-------------- functions/echo.sh | 12 ++-- functions/exit.sh | 2 +- functions/packages.sh | 8 +-- functions/stagefile.sh | 2 +- helpers/lh_binary | 6 +- helpers/lh_binary_chroot | 10 ++-- helpers/lh_binary_debian-installer | 10 ++-- helpers/lh_binary_disk | 4 +- helpers/lh_binary_encryption | 8 +-- helpers/lh_binary_grub | 8 +-- helpers/lh_binary_grub2 | 8 +-- helpers/lh_binary_includes | 2 +- helpers/lh_binary_iso | 8 +-- helpers/lh_binary_md5sum | 2 +- helpers/lh_binary_memtest | 8 +-- helpers/lh_binary_rootfs | 24 ++++---- helpers/lh_binary_silo | 12 ++-- helpers/lh_binary_syslinux | 34 +++++------ helpers/lh_binary_usb-hdd | 12 ++-- helpers/lh_binary_virtual-hdd | 4 +- helpers/lh_binary_win32-loader | 8 +-- helpers/lh_binary_yaboot | 10 ++-- helpers/lh_bootstrap_cdebootstrap | 10 ++-- helpers/lh_bootstrap_debootstrap | 4 +- helpers/lh_chroot_apt | 18 +++--- helpers/lh_chroot_devpts | 4 +- helpers/lh_chroot_hacks | 4 +- helpers/lh_chroot_interactive | 4 +- helpers/lh_chroot_proc | 4 +- helpers/lh_chroot_selinuxfs | 4 +- helpers/lh_chroot_sources | 24 ++++---- helpers/lh_chroot_symlinks | 2 +- helpers/lh_chroot_sysfs | 4 +- helpers/lh_chroot_sysvinit | 2 +- helpers/lh_config | 56 +++++++++--------- helpers/lh_source_debian | 4 +- helpers/lh_source_debian-live | 2 +- helpers/lh_source_disk | 4 +- helpers/lh_source_iso | 6 +- helpers/lh_source_md5sum | 4 +- helpers/lh_source_net | 2 +- helpers/lh_source_tar | 2 +- helpers/lh_source_usb-hdd | 2 +- helpers/lh_source_virtual-hdd | 6 +- manpages/lh_config.en.1 | 118 ++++++++++++++++++------------------- 53 files changed, 309 insertions(+), 309 deletions(-) diff --git a/debian/live-helper.cron.daily b/debian/live-helper.cron.daily index 0882de4..ea630f7 100644 --- a/debian/live-helper.cron.daily +++ b/debian/live-helper.cron.daily @@ -21,7 +21,7 @@ else fi # Checking for autobuild -if [ "${AUTOBUILD}" != "enabled" ] +if [ "${AUTOBUILD}" != "true" ] then exit 0 fi @@ -53,7 +53,7 @@ do echo "Begin: $(date -R)" > "${TEMPDIR}"/debian-live/log.txt # Generating images - lh_config -b iso -s tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} + lh_config -b iso -s tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source true ${OPTIONS} lh_build >> "${TEMPDIR}"/debian-live/log.txt 2>&1 echo "End: $(date -R)" >> "${TEMPDIR}"/debian-live/log.txt @@ -94,7 +94,7 @@ do echo "Begin: $(date -R)" > "${TEMPDIR}"/debian-live/log.txt # Generating images - lh_config -b usb-hdd -s tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} + lh_config -b usb-hdd -s tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source false ${OPTIONS} lh_build >> "${TEMPDIR}"/debian-live/log.txt 2>&1 echo "End: $(date -R)" >> "${TEMPDIR}"/debian-live/log.txt diff --git a/debian/live-helper.default b/debian/live-helper.default index b2ed78f..051417b 100644 --- a/debian/live-helper.default +++ b/debian/live-helper.default @@ -1,12 +1,12 @@ # Defaults for /etc/cron.daily/live-helper_autobuild -AUTOBUILD="disabled" +AUTOBUILD="false" DATE="$(date +%Y%m%d)" DESTDIR="/srv/debian-live" TEMPDIR="/srv/tmp/live-helper" -OPTIONS="--binary-indices disabled" +OPTIONS="--binary-indices false" ARCHITECTURES="$(dpkg --print-architecture)" DISTRIBUTIONS="sid" diff --git a/examples/cron/images.sh b/examples/cron/images.sh index 1c95ec8..d0edfc0 100755 --- a/examples/cron/images.sh +++ b/examples/cron/images.sh @@ -3,7 +3,7 @@ # Static variables DISTRIBUTIONS="${DISTRIBUTIONS:-lenny squeeze sid}" FLAVOURS="${FLAVOURS:-standard rescue gnome-desktop kde-desktop lxde-desktop xfce-desktop}" -SOURCE="${SOURCE:-enabled}" +SOURCE="${SOURCE:-true}" MIRROR="${MIRROR:-http://mirror/ftp.debian.org/debian/}" MIRROR_SECURITY="${MIRROR_SECURITY:-http://mirror/ftp.debian.org/debian-security/}" @@ -50,7 +50,7 @@ do i386) case "${FLAVOUR}" in standard|rescue|lxde-desktop|xfce-desktop) - INDICES="enabled" + INDICES="true" ;; gnome-desktop|kde-desktop) @@ -61,11 +61,11 @@ do ;; esac - if [ "${SOURCE}" = "enabled" ] + if [ "${SOURCE}" = "true" ] then - lh config -d ${DISTRIBUTION} -p ${FLAVOUR} --cache-stages "bootstrap rootfs" --apt-recommends disabled --binary-indices ${INDICES} --tasksel aptitude ${KERNEL} --source enabled --mirror-bootstrap ${MIRROR} --mirror-chroot ${MIRROR} --mirror-chroot-security ${MIRROR_SECURITY} + lh config -d ${DISTRIBUTION} -p ${FLAVOUR} --cache-stages "bootstrap rootfs" --apt-recommends false --binary-indices ${INDICES} --tasksel aptitude ${KERNEL} --source true --mirror-bootstrap ${MIRROR} --mirror-chroot ${MIRROR} --mirror-chroot-security ${MIRROR_SECURITY} else - lh config -d ${DISTRIBUTION} -p ${FLAVOUR} --cache-stages "bootstrap rootfs" --apt-recommends disabled --binary-indices ${INDICES} --tasksel aptitude ${KERNEL} --source disabled --mirror-bootstrap ${MIRROR} --mirror-chroot ${MIRROR} --mirror-chroot-security ${MIRROR_SECURITY} + lh config -d ${DISTRIBUTION} -p ${FLAVOUR} --cache-stages "bootstrap rootfs" --apt-recommends false --binary-indices ${INDICES} --tasksel aptitude ${KERNEL} --source false --mirror-bootstrap ${MIRROR} --mirror-chroot ${MIRROR} --mirror-chroot-security ${MIRROR_SECURITY} fi if [ "${DISTRIBUTION}" = "sid" ] @@ -84,7 +84,7 @@ do mv binary.list debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.iso.list mv binary.packages debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.iso.packages - if [ "${SOURCE}" = "enabled" ] + if [ "${SOURCE}" = "true" ] then mv source.tar.gz debian-live-${DISTRIBUTION}-source-${FLAVOUR}.tar.gz mv source.list debian-live-${DISTRIBUTION}-source-${FLAVOUR}.tar.gz.list diff --git a/functions/arguments.sh b/functions/arguments.sh index bbc439c..e65983a 100755 --- a/functions/arguments.sh +++ b/functions/arguments.sh @@ -23,7 +23,7 @@ Arguments () do case "${1}" in --breakpoints) - _BREAKPOINTS="enabled" + _BREAKPOINTS="true" shift ;; @@ -33,12 +33,12 @@ Arguments () ;; --debug) - _DEBUG="enabled" + _DEBUG="true" shift ;; --force) - _FORCE="enabled" + _FORCE="true" shift ;; @@ -48,7 +48,7 @@ Arguments () ;; --quiet) - _QUIET="enabled" + _QUIET="true" shift ;; @@ -58,7 +58,7 @@ Arguments () ;; --verbose) - _VERBOSE="enabled" + _VERBOSE="true" shift ;; diff --git a/functions/breakpoints.sh b/functions/breakpoints.sh index 2f078e1..0b47a6d 100755 --- a/functions/breakpoints.sh +++ b/functions/breakpoints.sh @@ -11,7 +11,7 @@ Breakpoint () { NAME="${1}" - if [ "${_BREAKPOINTS}" = "enabled" ] + if [ "${_BREAKPOINTS}" = "true" ] then Echo_message "Waiting at %s" "${NAME}" read WAIT diff --git a/functions/cache.sh b/functions/cache.sh index ca5e5ed..69f05c9 100755 --- a/functions/cache.sh +++ b/functions/cache.sh @@ -11,7 +11,7 @@ Restore_cache () { DIRECTORY="${1}" - if [ "${LH_CACHE}" = "enabled" ] && [ "${LH_CACHE_PACKAGES}" = "enabled" ] + if [ "${LH_CACHE}" = "true" ] && [ "${LH_CACHE_PACKAGES}" = "true" ] then if [ -d "${DIRECTORY}" ] then @@ -32,7 +32,7 @@ Save_cache () { DIRECTORY="${1}" - if [ "${LH_CACHE}" = "enabled" ] && [ "${LH_CACHE_PACKAGES}" = "enabled" ] + if [ "${LH_CACHE}" = "true" ] && [ "${LH_CACHE_PACKAGES}" = "true" ] then # Cleaning current cache Chroot chroot "apt-get autoclean" diff --git a/functions/chroot.sh b/functions/chroot.sh index 420abe1..e3af0c2 100755 --- a/functions/chroot.sh +++ b/functions/chroot.sh @@ -15,7 +15,7 @@ Chroot () # Executing commands in chroot Echo_debug "Executing: %s" "${COMMANDS}" - if [ "${LH_USE_FAKEROOT}" != "enabled" ] + if [ "${LH_USE_FAKEROOT}" != "true" ] then ${LH_ROOT_COMMAND} chroot "${CHROOT}" /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" TERM="${TERM}" ftp_proxy="${LH_APT_FTP_PROXY}" http_proxy="${LH_APT_HTTP_PROXY}" DEBIAN_FRONTEND="${LH_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LH_DEBCONF_PRIORITY}" DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" XORG_CONFIG="custom" ${COMMANDS} else diff --git a/functions/defaults.sh b/functions/defaults.sh index a2b3b7a..7275293 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -63,7 +63,7 @@ Set_defaults () fi # Setting apt pdiffs - LH_APT_PDIFFS="${LH_APT_PDIFFS:-enabled}" + LH_APT_PDIFFS="${LH_APT_PDIFFS:-true}" # Setting apt pipeline # LH_APT_PIPELINE @@ -84,16 +84,16 @@ Set_defaults () # Setting apt recommends case "${LH_MODE}" in debian|debian-release|ubuntu) - LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS:-enabled}" + LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS:-true}" ;; emdebian) - LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS:-disabled}" + LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS:-false}" ;; esac # Setting apt secure - LH_APT_SECURE="${LH_APT_SECURE:-enabled}" + LH_APT_SECURE="${LH_APT_SECURE:-true}" # Setting bootstrap program if [ -z "${LH_BOOTSTRAP}" ] || ( [ ! -x "$(which ${LH_BOOTSTRAP} 2>/dev/null)" ] && [ "${LH_BOOTSTRAP}" != "copy" ] ) @@ -111,9 +111,9 @@ Set_defaults () fi # Setting cache option - LH_CACHE="${LH_CACHE:-enabled}" - LH_CACHE_INDICES="${LH_CACHE_INDICES:-disabled}" - LH_CACHE_PACKAGES="${LH_CACHE_PACKAGES:-enabled}" + LH_CACHE="${LH_CACHE:-true}" + LH_CACHE_INDICES="${LH_CACHE_INDICES:-false}" + LH_CACHE_PACKAGES="${LH_CACHE_PACKAGES:-true}" LH_CACHE_STAGES="${LH_CACHE_STAGES:-bootstrap}" # Setting debconf frontend @@ -122,11 +122,11 @@ Set_defaults () LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY:-critical}" case "${LH_DEBCONF_NOWARNINGS}" in - enabled) + true) LH_DEBCONF_NOWARNINGS="yes" ;; - disabled) + false) LH_DEBCONF_NOWARNINGS="no" ;; esac @@ -189,7 +189,7 @@ Set_defaults () else if [ -x /usr/bin/sudo ] then - # FIXME: this is disabled until considered safe + # FIXME: this is false until considered safe #LH_ROOT_COMMAND="sudo" LH_ROOT_COMMAND="" fi @@ -229,12 +229,12 @@ Set_defaults () fi # Setting live helper options - _BREAKPOINTS="${_BREAKPOINTS:-disabled}" + _BREAKPOINTS="${_BREAKPOINTS:-false}" _COLOR="${_COLOR:-false}" - _DEBUG="${_DEBUG:-disabled}" - _FORCE="${_FORCE:-disabled}" - _QUIET="${_QUIET:-disabled}" - _VERBOSE="${_VERBOSE:-disabled}" + _DEBUG="${_DEBUG:-false}" + _FORCE="${_FORCE:-false}" + _QUIET="${_QUIET:-false}" + _VERBOSE="${_VERBOSE:-false}" ## config/bootstrap @@ -416,7 +416,7 @@ Set_defaults () LH_VIRTUAL_ROOT_SIZE="${LH_VIRTUAL_ROOT_SIZE:-10000}" # Setting whether to expose root filesystem as read only - LH_EXPOSED_ROOT="${LH_EXPOSED_ROOT:-disabled}" + LH_EXPOSED_ROOT="${LH_EXPOSED_ROOT:-false}" # Setting union filesystem LH_UNION_FILESYSTEM="${LH_UNION_FILESYSTEM:-aufs}" @@ -424,7 +424,7 @@ Set_defaults () # LH_HOOKS # Setting interactive shell/X11/Xnest - LH_INTERACTIVE="${LH_INTERACTIVE:-disabled}" + LH_INTERACTIVE="${LH_INTERACTIVE:-false}" # Setting keyring packages case "${LH_MODE}" in @@ -575,7 +575,7 @@ Set_defaults () fi case "${LH_ENCRYPTION}" in - ""|disabled) + ""|false) ;; @@ -603,7 +603,7 @@ Set_defaults () esac case "${LH_ENCRYPTION}" in - ""|disabled) + ""|false) ;; @@ -651,16 +651,16 @@ Set_defaults () # Setting security updates option if [ "${LH_MIRROR_CHROOT_SECURITY}" = "none" ] || [ "${LH_MIRROR_BINARY_SECURITY}" = "none" ] then - LH_SECURITY="disabled" + LH_SECURITY="false" fi - LH_SECURITY="${LH_SECURITY:-enabled}" + LH_SECURITY="${LH_SECURITY:-true}" # Setting symlink convertion option - LH_SYMLINKS="${LH_SYMLINKS:-disabled}" + LH_SYMLINKS="${LH_SYMLINKS:-false}" # Setting sysvinit option - LH_SYSVINIT="${LH_SYSVINIT:-disabled}" + LH_SYSVINIT="${LH_SYSVINIT:-false}" ## config/binary @@ -683,7 +683,7 @@ Set_defaults () then LH_BINARY_INDICES="${LH_BINARY_INDICES:-none}" else - LH_BINARY_INDICES="${LH_BINARY_INDICES:-enabled}" + LH_BINARY_INDICES="${LH_BINARY_INDICES:-true}" fi # Setting bootloader @@ -705,13 +705,13 @@ Set_defaults () fi # Setting checksums - LH_CHECKSUMS="${LH_CHECKSUMS:-enabled}" + LH_CHECKSUMS="${LH_CHECKSUMS:-true}" # Setting chroot option - LH_CHROOT_BUILD="${LH_CHROOT_BUILD:-enabled}" + LH_CHROOT_BUILD="${LH_CHROOT_BUILD:-true}" # Setting debian-installer option - LH_DEBIAN_INSTALLER="${LH_DEBIAN_INSTALLER:-disabled}" + LH_DEBIAN_INSTALLER="${LH_DEBIAN_INSTALLER:-false}" # Setting debian-installer distribution LH_DEBIAN_INSTALLER_DISTRIBUTION="${LH_DEBIAN_INSTALLER_DISTRIBUTION:-${LH_DISTRIBUTION}}" @@ -719,24 +719,24 @@ Set_defaults () # Setting debian-installer-gui case "${LH_MODE}" in debian) - LH_DEBIAN_INSTALLER_GUI="${LH_DEBIAN_INSTALLER_GUI:-enabled}" + LH_DEBIAN_INSTALLER_GUI="${LH_DEBIAN_INSTALLER_GUI:-true}" ;; ubuntu) case "${LH_DEBIAN_INSTALLER_DISTRIBUTION}" in karmic) # Not available for Karmic currently. - LH_DEBIAN_INSTALLER_GUI="${LH_DEBIAN_INSTALLER_GUI:-disabled}" + LH_DEBIAN_INSTALLER_GUI="${LH_DEBIAN_INSTALLER_GUI:-false}" ;; *) - LH_DEBIAN_INSTALLER_GUI="${LH_DEBIAN_INSTALLER_GUI:-enabled}" + LH_DEBIAN_INSTALLER_GUI="${LH_DEBIAN_INSTALLER_GUI:-true}" ;; esac ;; *) - LH_DEBIAN_INSTALLER_GUI="${LH_DEBIAN_INSTALLER_GUI:-disabled}" + LH_DEBIAN_INSTALLER_GUI="${LH_DEBIAN_INSTALLER_GUI:-false}" ;; esac @@ -803,7 +803,7 @@ Set_defaults () fi # Setting encryption - LH_ENCRYPTION="${LH_ENCRYPTION:-disabled}" + LH_ENCRYPTION="${LH_ENCRYPTION:-false}" # Setting grub splash # LH_GRUB_SPLASH @@ -881,16 +881,16 @@ Set_defaults () then case "${LH_ARCHITECTURE}" in amd64|i386) - if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ] + if [ "${LH_DEBIAN_INSTALLER}" != "false" ] then - LH_WIN32_LOADER="${LH_WIN32_LOADER:-enabled}" + LH_WIN32_LOADER="${LH_WIN32_LOADER:-true}" else - LH_WIN32_LOADER="${LH_WIN32_LOADER:-disabled}" + LH_WIN32_LOADER="${LH_WIN32_LOADER:-false}" fi ;; *) - LH_WIN32_LOADER="${LH_WIN32_LOADER:-disabled}" + LH_WIN32_LOADER="${LH_WIN32_LOADER:-false}" ;; esac fi @@ -934,7 +934,7 @@ Set_defaults () LH_SYSLINUX_TIMEOUT="${LH_SYSLINUX_TIMEOUT:-0}" # Setting syslinux menu - LH_SYSLINUX_MENU="${LH_SYSLINUX_MENU:-enabled}" + LH_SYSLINUX_MENU="${LH_SYSLINUX_MENU:-true}" # Setting syslinux menu live entries case "${LH_MODE}" in @@ -966,13 +966,13 @@ Set_defaults () ## config/source # Setting source option - LH_SOURCE="${LH_SOURCE:-disabled}" + LH_SOURCE="${LH_SOURCE:-false}" # Setting image type LH_SOURCE_IMAGES="${LH_SOURCE_IMAGES:-tar}" # Setting fakeroot/fakechroot - LH_USE_FAKEROOT="${LH_USE_FAKEROOT:-disabled}" + LH_USE_FAKEROOT="${LH_USE_FAKEROOT:-false}" } Check_defaults () @@ -1013,10 +1013,10 @@ Check_defaults () fi fi - if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ] + if [ "${LH_DEBIAN_INSTALLER}" != "false" ] then - # d-i enabled, no caching - if ! echo ${LH_CACHE_STAGES} | grep -qs "bootstrap\b" || [ "${LH_CACHE}" != "enabled" ] || [ "${LH_CACHE_PACKAGES}" != "enabled" ] + # d-i true, no caching + if ! echo ${LH_CACHE_STAGES} | grep -qs "bootstrap\b" || [ "${LH_CACHE}" != "true" ] || [ "${LH_CACHE_PACKAGES}" != "true" ] then Echo_warning "You have selected values of LH_CACHE, LH_CACHE_PACKAGES, LH_CACHE_STAGES and LH_DEBIAN_INSTALLER which will result in 'bootstrap' packages not being cached. This configuration is potentially unsafe as the bootstrap packages are re-used when integrating the Debian Installer." fi @@ -1067,7 +1067,7 @@ Check_defaults () if echo ${LH_PACKAGES_LISTS} | grep -qs -E "(stripped|minimal)\b" then - if [ "${LH_BINARY_INDICES}" = "enabled" ] + if [ "${LH_BINARY_INDICES}" = "true" ] then Echo_warning "You have selected hook to minimise image size but you are still including package indices with your value of LH_BINARY_INDICES." fi diff --git a/functions/echo.sh b/functions/echo.sh index 7af07a9..1a3b3a9 100755 --- a/functions/echo.sh +++ b/functions/echo.sh @@ -22,7 +22,7 @@ Echo () Echo_debug () { - if [ "${_DEBUG}" = "enabled" ] + if [ "${_DEBUG}" = "true" ] then STRING="${1}" shift @@ -38,7 +38,7 @@ Echo_debug () Echo_debug_running () { - if [ "${_DEBUG}" = "enabled" ] + if [ "${_DEBUG}" = "true" ] then STRING="${1}" shift @@ -81,7 +81,7 @@ Echo_error () Echo_message () { - if [ "${_QUIET}" != "enabled" ] + if [ "${_QUIET}" != "true" ] then STRING="${1}" shift @@ -104,7 +104,7 @@ Echo_message () Echo_message_running () { - if [ "${_QUIET}" != "enabled" ] + if [ "${_QUIET}" != "true" ] then STRING="${1}" shift @@ -134,7 +134,7 @@ Echo_message_running () Echo_verbose () { - if [ "${_VERBOSE}" = "enabled" ] + if [ "${_VERBOSE}" = "true" ] then STRING="${1}" shift @@ -150,7 +150,7 @@ Echo_verbose () Echo_verbose_running () { - if [ "${_VERBOSE}" != "enabled" ] + if [ "${_VERBOSE}" != "true" ] then STRING="${1}" shift diff --git a/functions/exit.sh b/functions/exit.sh index bbfaf58..928fd6e 100755 --- a/functions/exit.sh +++ b/functions/exit.sh @@ -11,7 +11,7 @@ Exit () { VALUE="${?}" - if [ "${_DEBUG}" = "enabled" ] + if [ "${_DEBUG}" = "true" ] then # Dump variables set | grep -e ^LH diff --git a/functions/packages.sh b/functions/packages.sh index 13c0bf4..ce5c76a 100755 --- a/functions/packages.sh +++ b/functions/packages.sh @@ -28,7 +28,7 @@ Check_package () Install_package () { - if [ -n "${_LH_PACKAGES}" ] && [ "${LH_CHROOT_BUILD}" != "disabled" ] + if [ -n "${_LH_PACKAGES}" ] && [ "${LH_CHROOT_BUILD}" != "false" ] then case "${LH_APT}" in apt|apt-get) @@ -44,7 +44,7 @@ Install_package () Remove_package () { - if [ -n "${_LH_PACKAGES}" ] && [ "${LH_CHROOT_BUILD}" != "disabled" ] + if [ -n "${_LH_PACKAGES}" ] && [ "${LH_CHROOT_BUILD}" != "false" ] then case "${LH_APT}" in apt|apt-get) @@ -69,7 +69,7 @@ Check_installed () PACKAGE="${2}" case "${LH_CHROOT_BUILD}" in - enabled) + true) if Chroot chroot "dpkg-query -s ${PACKAGE}" 2> /dev/null | grep -qs "Status: install" then INSTALL_STATUS=0 @@ -77,7 +77,7 @@ Check_installed () INSTALL_STATUS=1 fi ;; - disabled) + false) if which dpkg-query > /dev/null 2>&1 then if Chroot chroot "dpkg-query -s ${PACKAGE}" 2> /dev/null | grep -qs "Status: install" diff --git a/functions/stagefile.sh b/functions/stagefile.sh index 10f06fa..72e62eb 100755 --- a/functions/stagefile.sh +++ b/functions/stagefile.sh @@ -15,7 +15,7 @@ Check_stagefile () # Checking stage file if [ -f "${FILE}" ] then - if [ "${_FORCE}" != "enabled" ] + if [ "${_FORCE}" != "true" ] then # Skipping execution Echo_warning "skipping %s" "${NAME}" diff --git a/helpers/lh_binary b/helpers/lh_binary index f5508c5..33ee5d6 100755 --- a/helpers/lh_binary +++ b/helpers/lh_binary @@ -29,7 +29,7 @@ Setup_cleanup # Preparing root filesystem lh binary_chroot ${*} -if [ "${LH_CHROOT_BUILD}" = "enabled" ] +if [ "${LH_CHROOT_BUILD}" = "true" ] then # Configuring chroot lh chroot_devpts install ${*} @@ -65,7 +65,7 @@ lh binary_local-includes ${*} lh binary_local-hooks ${*} lh binary_md5sum ${*} -if [ "${LH_CHROOT_BUILD}" != "enabled" ] +if [ "${LH_CHROOT_BUILD}" != "true" ] then lh chroot_devpts install ${*} lh chroot_proc install ${*} @@ -80,7 +80,7 @@ lh binary_tar ${*} lh binary_usb-hdd ${*} lh binary_virtual-hdd ${*} -if [ "${LH_CHROOT_BUILD}" = "enabled" ] +if [ "${LH_CHROOT_BUILD}" = "true" ] then # Deconfiguring chroot rm -f .stage/chroot_sources diff --git a/helpers/lh_binary_chroot b/helpers/lh_binary_chroot index 6194826..7612810 100755 --- a/helpers/lh_binary_chroot +++ b/helpers/lh_binary_chroot @@ -40,7 +40,7 @@ Create_lockfile .lock # Normally, virtual filesystems are not mounted here, but people tend to be lazy if [ -f chroot/proc/version ] then - if [ "${LH_USE_FAKEROOT}" != "enabled" ] + if [ "${LH_USE_FAKEROOT}" != "true" ] then ${LH_ROOT_COMMAND} umount chroot/proc else @@ -51,7 +51,7 @@ fi if [ -d chroot/sys/kernel ] then - if [ "${LH_USE_FAKEROOT}" != "enabled" ] + if [ "${LH_USE_FAKEROOT}" != "true" ] then ${LH_ROOT_COMMAND} umount chroot/sys else @@ -61,18 +61,18 @@ then fi # Copying /dev if using fakeroot -if [ "${LH_USE_FAKEROOT}" = "enabled" ] +if [ "${LH_USE_FAKEROOT}" = "true" ] then rm -rf chroot/dev find /dev | cpio -dmpu chroot fi -if [ "${LH_CHROOT_BUILD}" = "disabled" ] +if [ "${LH_CHROOT_BUILD}" = "false" ] then exit 0 fi -if [ "${LH_CACHE}" = "enabled" ] && Find_files cache/stages_rootfs/filesystem* +if [ "${LH_CACHE}" = "true" ] && Find_files cache/stages_rootfs/filesystem* then exit 0 fi diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer index 9fccdfa..7f5af95 100755 --- a/helpers/lh_binary_debian-installer +++ b/helpers/lh_binary_debian-installer @@ -28,10 +28,10 @@ then exit 0 fi -if [ "${_DEBUG}" = "enabled" ] +if [ "${_DEBUG}" = "true" ] then WGET_OPTIONS="${WGET_OPTIONS} --verbose" -elif [ "${_QUIET}" = "enabled" ] +elif [ "${_QUIET}" = "true" ] then WGET_OPTIONS="${WGET_OPTIONS} --quiet" else @@ -40,10 +40,10 @@ fi # Check d-i configuration case "${LH_DEBIAN_INSTALLER}" in - enabled|cdrom|netinst|netboot|businesscard|live) + true|cdrom|netinst|netboot|businesscard|live) ;; - disabled) + false) exit 0 ;; @@ -287,7 +287,7 @@ else # Downloading graphical-installer DOWNLOAD_GTK_INSTALLER=0 - if [ "${LH_DEBIAN_INSTALLER_GUI}" = "enabled" ] + if [ "${LH_DEBIAN_INSTALLER_GUI}" = "true" ] then case "${LH_ARCHITECTURE}" in amd64|i386) diff --git a/helpers/lh_binary_disk b/helpers/lh_binary_disk index 8905e6d..2bbd73d 100755 --- a/helpers/lh_binary_disk +++ b/helpers/lh_binary_disk @@ -95,7 +95,7 @@ case "${LH_DEBIAN_INSTALLER}" in cp "${LH_BASE}"/data/debian-cd/${LH_DISTRIBUTION}/${LH_ARCHITECTURE}_udeb_include binary/.disk/udeb_include ;; - enabled|netinst|live) + true|netinst|live) echo "main" > binary/.disk/base_components touch binary/.disk/base_installable @@ -128,7 +128,7 @@ case "${LH_DEBIAN_INSTALLER}" in cp "${LH_BASE}"/data/debian-cd/${LH_DISTRIBUTION}/${LH_ARCHITECTURE}_businesscard_udeb_include binary/.disk/udeb_include ;; - disabled) + false) echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info ;; esac diff --git a/helpers/lh_binary_encryption b/helpers/lh_binary_encryption index 711f3da..2990afa 100755 --- a/helpers/lh_binary_encryption +++ b/helpers/lh_binary_encryption @@ -31,7 +31,7 @@ fi case "${LH_ENCRYPTION}" in aes128|aes192|aes256) ;; - ""|disabled) + ""|false) exit 0 ;; *) @@ -85,7 +85,7 @@ Install_package Echo_message "Encrypting binary/%s/filesystem.%s with %s..." "${INITFS}" "${LH_CHROOT_FILESYSTEM}" "${LH_ENCRYPTION}" -if [ "${LH_CHROOT_BUILD}" = "enabled" ] +if [ "${LH_CHROOT_BUILD}" = "true" ] then # Moving image mv binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM} chroot @@ -101,7 +101,7 @@ do echo case "${LH_CHROOT_BUILD}" in - enabled) + true) if Chroot chroot aespipe -e ${LH_ENCRYPTION} -T \ < chroot/filesystem.${LH_CHROOT_FILESYSTEM} \ > chroot/filesystem.${LH_CHROOT_FILESYSTEM}.tmp @@ -110,7 +110,7 @@ do break fi ;; - disabled) + false) if aespipe -e ${LH_ENCRYPTION} -T \ < binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM} \ > binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM}.tmp diff --git a/helpers/lh_binary_grub b/helpers/lh_binary_grub index b2ccfea..35fa43d 100755 --- a/helpers/lh_binary_grub +++ b/helpers/lh_binary_grub @@ -157,7 +157,7 @@ mkdir -p "${DESTDIR_LIVE}" # Setting boot parameters case "${LH_ENCRYPTION}" in - ""|disabled) + ""|false) ;; *) LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}" @@ -206,7 +206,7 @@ then exit 1 fi -if [ "${LH_EXPOSED_ROOT}" != "disabled" ] +if [ "${LH_EXPOSED_ROOT}" != "false" ] then LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} exposedroot" fi @@ -237,7 +237,7 @@ done 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 LINUX_LIVE="title\t\tLive:\nroot\n\n${LINUX_LIVE}" LINUX_INSTALL="title\t\tInstaller:\nroot" @@ -285,7 +285,7 @@ case ${LH_BINARY_IMAGES} in ;; esac -if [ "${LH_CHROOT_BUILD}" = "disabled" ] +if [ "${LH_CHROOT_BUILD}" = "false" ] then FILES="$(echo ${FILES} | sed -e 's|chroot||g')" fi diff --git a/helpers/lh_binary_grub2 b/helpers/lh_binary_grub2 index 41d9483..76b9373 100755 --- a/helpers/lh_binary_grub2 +++ b/helpers/lh_binary_grub2 @@ -131,7 +131,7 @@ mkdir -p "${DESTDIR_LIVE}" # Setting boot parameters case "${LH_ENCRYPTION}" in - ""|disabled) + ""|false) ;; *) LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}" @@ -180,7 +180,7 @@ then exit 1 fi -if [ "${LH_EXPOSED_ROOT}" != "disabled" ] +if [ "${LH_EXPOSED_ROOT}" != "false" ] then LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} exposedroot" fi @@ -211,7 +211,7 @@ done 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 LINUX_LIVE="#\t \"Live\"\n${LINUX_LIVE}" LINUX_INSTALL="#\t \"Installer\"\n" @@ -258,7 +258,7 @@ case ${LH_BINARY_IMAGES} in ;; esac -if [ "${LH_CHROOT_BUILD}" = "disabled" ] +if [ "${LH_CHROOT_BUILD}" = "false" ] then FILES="$(echo ${FILES} | sed -e 's|chroot||g')" fi diff --git a/helpers/lh_binary_includes b/helpers/lh_binary_includes index e7f6e60..196f902 100755 --- a/helpers/lh_binary_includes +++ b/helpers/lh_binary_includes @@ -115,7 +115,7 @@ then cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live."${ARCH}"/* binary fi -if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ] +if [ "${LH_DEBIAN_INSTALLER}" != "false" ] then # Copying install templates if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install ] && \ diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso index edf21a0..47529d6 100755 --- a/helpers/lh_binary_iso +++ b/helpers/lh_binary_iso @@ -61,12 +61,12 @@ fi GENISOIMAGE_OPTIONS="-J -l -cache-inodes -allow-multidot" # Handle genisoimage live-helper specific options -if [ "${_QUIET}" = "enabled" ] +if [ "${_QUIET}" = "true" ] then GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -quiet" fi -if [ "${_VERBOSE}" = "enabled" ] +if [ "${_VERBOSE}" = "true" ] then GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v" fi @@ -176,7 +176,7 @@ genisoimage ${GENISOIMAGE_OPTIONS} -o binary.iso binary EOF case "${LH_CHROOT_BUILD}" in - enabled) + true) # Moving image mv binary.sh chroot mv binary chroot @@ -188,7 +188,7 @@ case "${LH_CHROOT_BUILD}" in rm -f chroot/binary.sh ;; - disabled) + false) sh binary.sh rm -f binary.sh ;; diff --git a/helpers/lh_binary_md5sum b/helpers/lh_binary_md5sum index 6cc88df..57087d8 100755 --- a/helpers/lh_binary_md5sum +++ b/helpers/lh_binary_md5sum @@ -23,7 +23,7 @@ Arguments "${@}" Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source Set_defaults -if [ "${LH_CHECKSUMS}" != "enabled" ] || [ "${LH_BINARY_IMAGES}" = "virtual-hdd" ] +if [ "${LH_CHECKSUMS}" != "true" ] || [ "${LH_BINARY_IMAGES}" = "virtual-hdd" ] then exit 0 fi diff --git a/helpers/lh_binary_memtest b/helpers/lh_binary_memtest index 98a3be5..581ec9a 100755 --- a/helpers/lh_binary_memtest +++ b/helpers/lh_binary_memtest @@ -23,7 +23,7 @@ Arguments "${@}" Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source Set_defaults -if [ "${LH_BINARY_IMAGES}" = "virtual-hdd" ] || [ "${LH_MEMTEST}" = "disabled" ] || [ "${LH_MEMTEST}" = "none" ] +if [ "${LH_BINARY_IMAGES}" = "virtual-hdd" ] || [ "${LH_MEMTEST}" = "false" ] || [ "${LH_MEMTEST}" = "none" ] then exit 0 fi @@ -48,7 +48,7 @@ then exit 0 fi -if [ "${LH_CHROOT_BUILD}" = "enabled" ] +if [ "${LH_CHROOT_BUILD}" = "true" ] then if [ -f chroot/usr/sbin/grub ] && [ ! -f chroot/boot/grub/menu.lst ] @@ -95,11 +95,11 @@ mkdir -p "${DESTDIR}" # Installing memtest case "${LH_CHROOT_BUILD}" in - enabled) + true) cp chroot/boot/${LH_MEMTEST}.bin "${DESTDIR}"/memtest ;; - disabled) + false) cp /boot/${LH_MEMTEST}.bin "${DESTDIR}"/memtest ;; esac diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs index 39c7d62..2c06ff4 100755 --- a/helpers/lh_binary_rootfs +++ b/helpers/lh_binary_rootfs @@ -83,7 +83,7 @@ do done # Handling chroot excludes -if [ "${LH_CHROOT_BUILD}" = "enabled" ] +if [ "${LH_CHROOT_BUILD}" = "true" ] then if [ -f config/binary_rootfs/excludes ] then @@ -136,7 +136,7 @@ case "${LH_CHROOT_FILESYSTEM}" in RESERVED_PERCENTAGE="--reserved-percentage" case "${LH_CHROOT_BUILD}" in - enabled) + true) Chroot chroot "genext2fs --size-in-blocks=${REAL_DIM} ${RESERVED_PERCENTAGE}=0 --root=chroot filesystem.${LH_CHROOT_FILESYSTEM}" # Move image @@ -176,7 +176,7 @@ case "${LH_CHROOT_FILESYSTEM}" in fi ;; - disabled) + false) genext2fs --size-in-blocks=${REAL_DIM} ${RESERVED_PERCENTAGE}=0 --root=chroot binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM} ;; esac @@ -210,7 +210,7 @@ case "${LH_CHROOT_FILESYSTEM}" in fi case "${LH_CHROOT_BUILD}" in - enabled) + true) Chroot chroot "mkfs.jffs2 ${JFFS2_OPTIONS} --root=chroot --output filesystem.jffs2" # Move image @@ -248,7 +248,7 @@ case "${LH_CHROOT_FILESYSTEM}" in fi ;; - disabled) + false) mkfs.jffs2 ${JFFS2_OPTIONS} --root=chroot --output binary/${INITFS}/filesystem.jffs2 ;; esac @@ -267,11 +267,11 @@ case "${LH_CHROOT_FILESYSTEM}" in fi case "${LH_CHROOT_BUILD}" in - enabled) + true) mv chroot/chroot binary/${INITFS}/filesystem.dir ;; - disabled) + false) cp -a chroot binary/${INITFS}/filesystem.dir ;; esac @@ -298,7 +298,7 @@ case "${LH_CHROOT_FILESYSTEM}" in MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -no-progress" - if [ "${_VERBOSE}" = "enabled" ] + if [ "${_VERBOSE}" = "true" ] then MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -info" fi @@ -310,7 +310,7 @@ case "${LH_CHROOT_FILESYSTEM}" in fi case "${LH_CHROOT_BUILD}" in - enabled) + true) # Create image Chroot chroot "mksquashfs chroot filesystem.squashfs ${MKSQUASHFS_OPTIONS}" @@ -354,7 +354,7 @@ case "${LH_CHROOT_FILESYSTEM}" in ${LH_ROOT_COMMAND} chmod 0644 binary/${INITFS}/filesystem.squashfs ;; - disabled) + false) if [ -f config/binary_rootfs/excludes ] then case "${LH_DISTRIBUTION}" in @@ -387,11 +387,11 @@ case "${LH_CHROOT_FILESYSTEM}" in fi case "${LH_CHROOT_BUILD}" in - enabled) + true) mv chroot/chroot binary ;; - disabled) + false) Echo_message "This may take a while." cp -a chroot binary ;; 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 diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux index 70ff5d8..ee1d961 100755 --- a/helpers/lh_binary_syslinux +++ b/helpers/lh_binary_syslinux @@ -191,7 +191,7 @@ Copy_syslinux_templates () { cp -r "${TEMPLATES}"/common/* ${SCREEN_PATH} - if [ "${LH_SYSLINUX_MENU}" = "disabled" ] + if [ "${LH_SYSLINUX_MENU}" = "false" ] then cp "${TEMPLATES}"/normal/* ${SCREEN_PATH} else @@ -221,10 +221,10 @@ Copy_syslinux_templates () esac case "${LH_CHROOT_BUILD}" in - enabled) + true) cp chroot/usr/lib/syslinux/"${MENUMODULE}" ${DATA_PATH} ;; - disabled) + false) cp /usr/lib/syslinux/"${MENUMODULE}" ${DATA_PATH} ;; esac @@ -248,7 +248,7 @@ Copy_syslinux_templates () done fi - if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ] + if [ "${LH_DEBIAN_INSTALLER}" != "false" ] then if ls ${SCREEN_PATH}/*.install > /dev/null 2>&1 then @@ -277,7 +277,7 @@ Copy_syslinux_templates () rm -f ${SCREEN_PATH}/*.install* fi - if [ "${LH_SYSLINUX_MENU}" = "enabled" ] + if [ "${LH_SYSLINUX_MENU}" = "true" ] then rm -f ${DATA_PATH}/boot.txt fi @@ -290,7 +290,7 @@ Copy_syslinux_templates () rm -f ${SCREEN_PATH}/splash.rle rm -f ${DATA_PATH}/splash.png else - if [ "${LH_SYSLINUX_MENU}" = "disabled" ] + if [ "${LH_SYSLINUX_MENU}" = "false" ] then SPLASH="${LIVE_DATA_PATH}/splash.rle" else @@ -409,7 +409,7 @@ mkdir -p "${DATA_PATH}" # Setting boot parameters case "${LH_ENCRYPTION}" in - ""|disabled) + ""|false) ;; *) LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}" @@ -453,7 +453,7 @@ then LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} union=${LH_UNION_FILESYSTEM}" fi -if [ "${LH_EXPOSED_ROOT}" != "disabled" ] +if [ "${LH_EXPOSED_ROOT}" != "false" ] then LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} exposedroot" fi @@ -511,7 +511,7 @@ then mv binary/${INITFS}/vmlinuz* ${KERNEL_PATH} mv binary/${INITFS}/initrd* ${KERNEL_PATH} - if [ "${LH_MEMTEST}" != "disabled" ] && [ "${LH_MEMTEST}" != "none" ] + if [ "${LH_MEMTEST}" != "false" ] && [ "${LH_MEMTEST}" != "none" ] then mv binary/${INITFS}/memtest ${KERNEL_PATH} fi @@ -539,14 +539,14 @@ fi # Only needed for non-vesamenu, non-gfxboot syslinux case "${LH_SYSLINUX_MENU}" in - disabled|menu) + false|menu) # Adding syslinux hardcoded default label entry Syslinux_live_entry "linux" "" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}" ;; esac # Assembling debian-installer configuration -if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ] +if [ "${LH_DEBIAN_INSTALLER}" != "false" ] then VMLINUZ_DI="vmlinuz" INITRD_DI="initrd.gz" @@ -583,10 +583,10 @@ Configure_syslinux_templates case "${LH_BINARY_IMAGES}" in iso) case "${LH_CHROOT_BUILD}" in - enabled) + true) cp chroot/usr/lib/syslinux/isolinux.bin ${SCREEN_PATH} ;; - disabled) + false) cp /usr/lib/syslinux/isolinux.bin ${SCREEN_PATH} ;; esac @@ -602,10 +602,10 @@ case "${LH_BINARY_IMAGES}" in net) case "${LH_CHROOT_BUILD}" in - enabled) + true) cp chroot/usr/lib/syslinux/pxelinux.0 ${KERNEL_PATH} ;; - disabled) + false) cp /usr/lib/syslinux/pxelinux.0 ${KERNEL_PATH} ;; esac @@ -633,10 +633,10 @@ case "${LH_BINARY_IMAGES}" in tar|usb-hdd) case "${LH_CHROOT_BUILD}" in - enabled) + true) cp chroot/usr/lib/syslinux/isolinux.bin ${SCREEN_PATH}/syslinux.bin ;; - disabled) + false) cp /usr/lib/syslinux/isolinux.bin ${SCREEN_PATH}/syslinux.bin ;; esac diff --git a/helpers/lh_binary_usb-hdd b/helpers/lh_binary_usb-hdd index c5e0ef4..53d9e37 100755 --- a/helpers/lh_binary_usb-hdd +++ b/helpers/lh_binary_usb-hdd @@ -142,7 +142,7 @@ case "${LH_BINARY_FILESYSTEM}" in esac case "${LH_CHROOT_BUILD}" in - enabled) + true) Chroot chroot "parted -s ${FREELO} mklabel ${PARTITION_TABLE_TYPE}" || true Chroot chroot "parted -s ${FREELO} mkpart primary ${PARTITION_TYPE} 0.0 100%" || true Chroot chroot "parted -s ${FREELO} set 1 boot on" || true @@ -154,7 +154,7 @@ case "${LH_CHROOT_BUILD}" in fi ;; - disabled) + false) parted -s ${FREELO} mklabel ${PARTITION_TABLE_TYPE} || true parted -s ${FREELO} mkpart primary ${PARTITION_TYPE} 0.0 100% || true parted -s ${FREELO} set 1 boot on || true @@ -191,11 +191,11 @@ case "${LH_BINARY_FILESYSTEM}" in esac case "${LH_CHROOT_BUILD}" in - enabled) + true) Chroot chroot "mkfs.${MKFS} ${MKFS_OPTIONS} ${FREELO}" ;; - disabled) + false) mkfs.${MKFS} ${MKFS_OPTIONS} ${FREELO} ;; esac @@ -247,11 +247,11 @@ rmdir chroot/binary.tmp if [ "${LH_BOOTLOADER}" = "syslinux" ] then case "${LH_CHROOT_BUILD}" in - enabled) + true) Chroot chroot "syslinux ${FREELO}" ;; - disabled) + false) syslinux ${FREELO} ;; esac diff --git a/helpers/lh_binary_virtual-hdd b/helpers/lh_binary_virtual-hdd index 83dec0c..6a65d19 100755 --- a/helpers/lh_binary_virtual-hdd +++ b/helpers/lh_binary_virtual-hdd @@ -42,7 +42,7 @@ Check_lockfile .lock # Creating lock file Create_lockfile .lock -if [ "${LH_CHROOT_BUILD}" = "enabled" ] +if [ "${LH_CHROOT_BUILD}" = "true" ] then case "${LH_BINARY_FILESYSTEM}" in ext2|ext3) @@ -66,7 +66,7 @@ fi Echo_message "Creating virtual disk image..." dd if=/dev/zero of=binary-virtual.img bs=1024k count=0 seek=${LH_VIRTUAL_ROOT_SIZE} -if [ "${LH_CHROOT_BUILD}" = "enabled" ] +if [ "${LH_CHROOT_BUILD}" = "true" ] then mv binary-virtual.img chroot diff --git a/helpers/lh_binary_win32-loader b/helpers/lh_binary_win32-loader index 6a61dfa..6851218 100755 --- a/helpers/lh_binary_win32-loader +++ b/helpers/lh_binary_win32-loader @@ -23,7 +23,7 @@ Arguments "${@}" Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source Set_defaults -if [ "${LH_WIN32_LOADER}" != "enabled" ] || [ "${LH_BINARY_IMAGES}" = "virtual-hdd" ] +if [ "${LH_WIN32_LOADER}" != "true" ] || [ "${LH_BINARY_IMAGES}" = "virtual-hdd" ] then exit 0 fi @@ -44,7 +44,7 @@ Create_lockfile .lock case "${LH_ARCHITECTURE}" in amd64|i386) - if [ "${LH_CHROOT_BUILD}" = "enabled" ] + if [ "${LH_CHROOT_BUILD}" = "true" ] then # Checking depends Check_package chroot/usr/lib/win32-loader/win32-loader.exe win32-loader @@ -63,7 +63,7 @@ case "${LH_ARCHITECTURE}" in mv binary/win32-loader.exe binary/setup.exe - if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ] + if [ "${LH_DEBIAN_INSTALLER}" != "false" ] then cat > binary/win32-loader.ini << EOF @@ -89,7 +89,7 @@ EOF ;; *) - Echo_warning "win32-loader inclusion is enabled but not compatible with your architecture, ignoring." + Echo_warning "win32-loader inclusion is set to true but not compatible with your architecture, ignoring." ;; esac diff --git a/helpers/lh_binary_yaboot b/helpers/lh_binary_yaboot index d0e707c..fdd857d 100755 --- a/helpers/lh_binary_yaboot +++ b/helpers/lh_binary_yaboot @@ -162,7 +162,7 @@ mkdir -p "${DESTDIR_LIVE}" # Setting boot parameters case "${LH_ENCRYPTION}" in - ""|disabled) + ""|false) ;; *) LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}" @@ -212,7 +212,7 @@ then exit 1 fi -if [ "${LH_EXPOSED_ROOT}" != "disabled" ] +if [ "${LH_EXPOSED_ROOT}" != "false" ] then LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} exposedroot" fi @@ -248,7 +248,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" @@ -277,11 +277,11 @@ case "${LH_BINARY_IMAGES}" in mkdir -p binary/yaboot case "${LH_CHROOT_BUILD}" in - enabled) + true) cp chroot/usr/lib/yaboot/yaboot binary/yaboot ;; - disabled) + false) cp /usr/lib/yaboot/yaboot binary/yaboot ;; esac diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/lh_bootstrap_cdebootstrap index 2694aba..1f9340b 100755 --- a/helpers/lh_bootstrap_cdebootstrap +++ b/helpers/lh_bootstrap_cdebootstrap @@ -99,29 +99,29 @@ else esac fi -if [ "${_DEBUG}" = "enabled" ] +if [ "${_DEBUG}" = "true" ] then CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --debug" fi -if [ "${_QUIET}" = "enabled" ] +if [ "${_QUIET}" = "true" ] then CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --quiet" fi -if [ "${_VERBOSE}" = "enabled" ] +if [ "${_VERBOSE}" = "true" ] then CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --verbose" fi -if [ "${LH_APT_SECURE}" = "disabled" ] +if [ "${LH_APT_SECURE}" = "false" ] then CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --allow-unauthenticated" fi if [ -x "/usr/bin/cdebootstrap" ] || [ -x "/usr/bin/cdebootstrap-static" ] then - if [ "${LH_CACHE_PACKAGES}" = "enabled" ] + if [ "${LH_CACHE_PACKAGES}" = "true" ] then if [ -d cache/packages_bootstrap ] then diff --git a/helpers/lh_bootstrap_debootstrap b/helpers/lh_bootstrap_debootstrap index 4c30895..b1a5349 100755 --- a/helpers/lh_bootstrap_debootstrap +++ b/helpers/lh_bootstrap_debootstrap @@ -83,7 +83,7 @@ then DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --exclude=$(echo ${LH_BOOTSTRAP_EXCLUDE} | sed 's| *|,|g')" fi -if [ "${LH_USE_FAKEROOT}" != "enabled" ] +if [ "${LH_USE_FAKEROOT}" != "true" ] then if [ -z "${LH_BOOTSTRAP_FLAVOUR}" ] then @@ -114,7 +114,7 @@ fi if [ -x "/usr/sbin/debootstrap" ] then - if [ "${LH_CACHE_PACKAGES}" = "enabled" ] + if [ "${LH_CACHE_PACKAGES}" = "true" ] then if [ -d cache/packages_bootstrap ] then diff --git a/helpers/lh_chroot_apt b/helpers/lh_chroot_apt index 4396aeb..6836c2d 100755 --- a/helpers/lh_chroot_apt +++ b/helpers/lh_chroot_apt @@ -55,11 +55,11 @@ case "${1}" in # Configuring apt pdiffs case "${LH_APT_PDIFFS}" in - enabled) + true) echo "Acquire::PDiffs \"true\";" > chroot/etc/apt/apt.conf.d/00pdiffs ;; - disabled) + false) echo "Acquire::PDiffs \"false\";" > chroot/etc/apt/apt.conf.d/00pdiffs ;; esac @@ -72,12 +72,12 @@ case "${1}" in # Configuring apt recommends case "${LH_APT_RECOMMENDS}" in - enabled) + true) echo "APT::Install-Recommends \"true\";" > chroot/etc/apt/apt.conf.d/00recommends echo "Aptitude::Recommends-Important \"true\";" >> chroot/etc/apt/apt.conf.d/00recommends ;; - disabled) + false) echo "APT::Install-Recommends \"false\";" > chroot/etc/apt/apt.conf.d/00recommends echo "Aptitude::Recommends-Important \"false\";" >> chroot/etc/apt/apt.conf.d/00recommends ;; @@ -85,12 +85,12 @@ case "${1}" in # Configuring apt secure case "${LH_APT_SECURE}" in - enabled) + true) echo "APT::Get::AllowUnauthenticated \"false\";" > chroot/etc/apt/apt.conf.d/00secure echo "Aptitude::CmdLine::Ignore-Trust-Violations \"false\";" >> chroot/etc/apt/apt.conf.d/00secure ;; - disabled) + false) echo "APT::Get::AllowUnauthenticated \"true\";" > chroot/etc/apt/apt.conf.d/00secure echo "Aptitude::CmdLine::Ignore-Trust-Violations \"true\";" >> chroot/etc/apt/apt.conf.d/00secure ;; @@ -163,7 +163,7 @@ case "${1}" in rm -f chroot/etc/apt/apt.conf.d/00http-proxy # Deconfiguring aptitude pdiffs - if [ "${LH_APT_PDIFFS}" = "enabled" ] + if [ "${LH_APT_PDIFFS}" = "true" ] then rm -f chroot/etc/apt/apt.conf.d/00pdiffs fi @@ -172,13 +172,13 @@ case "${1}" in rm -f chroot/etc/apt/apt.conf.d/00pipeline # Deconfiguring aptitude recommends - if [ "${LH_APT_RECOMMENDS}" = "enabled" ] + if [ "${LH_APT_RECOMMENDS}" = "true" ] then rm -f chroot/etc/apt/apt.conf.d/00recommends fi # Deconfiguring aptitude secure - if [ "${LH_APT_SECURE}" = "enabled" ] + if [ "${LH_APT_SECURE}" = "true" ] then rm -f chroot/etc/apt/apt.conf.d/00secure fi diff --git a/helpers/lh_chroot_devpts b/helpers/lh_chroot_devpts index d652fe5..75edab2 100755 --- a/helpers/lh_chroot_devpts +++ b/helpers/lh_chroot_devpts @@ -42,7 +42,7 @@ case "${1}" in # Creating lock file Create_lockfile .lock - if [ "${LH_USE_FAKEROOT}" != "enabled" ] + if [ "${LH_USE_FAKEROOT}" != "true" ] then # Creating mountpoint mkdir -p chroot/dev/pts @@ -65,7 +65,7 @@ case "${1}" in Create_lockfile .lock # Unmounting /dev/pts - if [ "${LH_USE_FAKEROOT}" != "enabled" ] + if [ "${LH_USE_FAKEROOT}" != "true" ] then if Find_files chroot/dev/pts/* then diff --git a/helpers/lh_chroot_hacks b/helpers/lh_chroot_hacks index 34b31d9..66fb365 100755 --- a/helpers/lh_chroot_hacks +++ b/helpers/lh_chroot_hacks @@ -135,7 +135,7 @@ then esac fi -if [ "${LH_EXPOSED_ROOT}" = "enabled" ] +if [ "${LH_EXPOSED_ROOT}" = "true" ] then # Make sure RW dirs exist so that the initramfs script has # a directory in which to bind the tmpfs filesystems @@ -181,7 +181,7 @@ if [ -e chroot/etc/init.d/resolvconf ] then Echo_warning "Your live system appears to include resolvconf which is by its nature incompatible in most ways with debian-live." Echo_warning "Keeping resolvconf installed *can* lead to broken network support in the resulting live system." - Echo_warning "Unless you really know what you are doing, we recommend that you neither install resolvconf explicitly nor implicitly through another package's relation (e.g. by having automatic installation of recommended packages enabled)." + Echo_warning "Unless you really know what you are doing, we recommend that you neither install resolvconf explicitly nor implicitly through another package's relation (e.g. by having automatic installation of recommended packages to true)." fi # Creating stage file diff --git a/helpers/lh_chroot_interactive b/helpers/lh_chroot_interactive index 242cb66..eb9c011 100755 --- a/helpers/lh_chroot_interactive +++ b/helpers/lh_chroot_interactive @@ -23,7 +23,7 @@ Arguments "${@}" Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source Set_defaults -if [ "${LH_INTERACTIVE}" = "disabled" ] +if [ "${LH_INTERACTIVE}" = "false" ] then exit 0 fi @@ -43,7 +43,7 @@ Check_lockfile .lock Create_lockfile .lock case "${LH_INTERACTIVE}" in - enabled|shell) + true|shell) Echo_message "Pausing build: starting interactive shell..." Chroot chroot "/bin/bash --login" ;; diff --git a/helpers/lh_chroot_proc b/helpers/lh_chroot_proc index 7878bf5..392fa5e 100755 --- a/helpers/lh_chroot_proc +++ b/helpers/lh_chroot_proc @@ -42,7 +42,7 @@ case "${1}" in # Creating lock file Create_lockfile .lock - if [ "${LH_USE_FAKEROOT}" != "enabled" ] + if [ "${LH_USE_FAKEROOT}" != "true" ] then # Creating mountpoint mkdir -p chroot/proc @@ -67,7 +67,7 @@ case "${1}" in # Creating lock file Create_lockfile .lock - if [ "${LH_USE_FAKEROOT}" != "enabled" ] + if [ "${LH_USE_FAKEROOT}" != "true" ] then # Workaround binfmt-support /proc locking if [ -e chroot/proc/sys/fs/binfmt_misc/status ] diff --git a/helpers/lh_chroot_selinuxfs b/helpers/lh_chroot_selinuxfs index 1a81c57..558d3d7 100755 --- a/helpers/lh_chroot_selinuxfs +++ b/helpers/lh_chroot_selinuxfs @@ -44,7 +44,7 @@ case "${1}" in # Creating lock file Create_lockfile .lock - if [ "${LH_USE_FAKEROOT}" != "enabled" ] + if [ "${LH_USE_FAKEROOT}" != "true" ] then # Create mountpoint mkdir -p chroot/selinux @@ -70,7 +70,7 @@ case "${1}" in # Creating lock file Create_lockfile .lock - if [ "${LH_USE_FAKEROOT}" != "enabled" ] + if [ "${LH_USE_FAKEROOT}" != "true" ] then # Unmounting /selinux #fuser -km chroot/selinux diff --git a/helpers/lh_chroot_sources b/helpers/lh_chroot_sources index 605dd80..8b3682e 100755 --- a/helpers/lh_chroot_sources +++ b/helpers/lh_chroot_sources @@ -44,18 +44,18 @@ case "${1}" in # Configure custom sources.list echo "deb ${LH_MIRROR_CHROOT} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" > chroot/etc/apt/sources.list - if [ "${LH_SOURCE}" = "enabled" ] + if [ "${LH_SOURCE}" = "true" ] then echo "deb-src ${LH_MIRROR_CHROOT} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list fi - if [ "${LH_SECURITY}" = "enabled" ] + if [ "${LH_SECURITY}" = "true" ] then case "${LH_MODE}" in ubuntu) echo "deb ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}-security ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list - if [ "${LH_SOURCE}" = "enabled" ] + if [ "${LH_SOURCE}" = "true" ] then echo "deb-src ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}-security ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list fi @@ -66,7 +66,7 @@ case "${1}" in then echo "deb ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list - if [ "${LH_SOURCE}" = "enabled" ] + if [ "${LH_SOURCE}" = "true" ] then echo "deb-src ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list fi @@ -145,7 +145,7 @@ case "${1}" in -o APT::FTPArchive::Release::Origin=chroot_local-packages \ release . > Release" | Chroot chroot sh - if [ "${LH_APT_SECURE}" = "enabled" ] + if [ "${LH_APT_SECURE}" = "true" ] then _LH_DOTGNUPG_EXISTED=0 if [ -d chroot/root/.gnupg ] @@ -234,7 +234,7 @@ case "${1}" in fi # Update indices from cache - if [ "${LH_CACHE_INDICES}" = "enabled" ] && [ -d cache/indices_bootstrap ] + if [ "${LH_CACHE_INDICES}" = "true" ] && [ -d cache/indices_bootstrap ] then if Find_files cache/indices_bootstrap/secring.gpg* then @@ -316,7 +316,7 @@ case "${1}" in Apt update fi - if [ "${LH_CACHE_INDICES}" = "enabled" ] + if [ "${LH_CACHE_INDICES}" = "true" ] then mkdir -p cache/indices_bootstrap @@ -355,7 +355,7 @@ case "${1}" in Create_lockfile .lock # Configure generic indices - if [ "${LH_BINARY_INDICES}" = "enabled" ] + if [ "${LH_BINARY_INDICES}" = "true" ] then # Don't do anything if it's not required if [ "${LH_MIRROR_CHROOT}" = "${LH_MIRROR_BINARY}" ] && \ @@ -374,18 +374,18 @@ case "${1}" in echo "deb ${LH_MIRROR_BINARY} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" > chroot/etc/apt/sources.list - if [ "${LH_SOURCE}" = "enabled" ] + if [ "${LH_SOURCE}" = "true" ] then echo "deb-src ${LH_MIRROR_BINARY} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list fi - if [ "${LH_SECURITY}" = "enabled" ] + if [ "${LH_SECURITY}" = "true" ] then case "${LH_MODE}" in ubuntu) echo "deb ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}-security ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list - if [ "${LH_SOURCE}" = "enabled" ] + if [ "${LH_SOURCE}" = "true" ] then echo "deb-src ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}-security ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list fi @@ -396,7 +396,7 @@ case "${1}" in then echo "deb ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list - if [ "${LH_SOURCE}" = "enabled" ] + if [ "${LH_SOURCE}" = "true" ] then echo "deb-src ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list fi diff --git a/helpers/lh_chroot_symlinks b/helpers/lh_chroot_symlinks index abdbbf7..576f06e 100755 --- a/helpers/lh_chroot_symlinks +++ b/helpers/lh_chroot_symlinks @@ -23,7 +23,7 @@ Arguments "${@}" Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source Set_defaults -if [ "${LH_SYMLINKS}" != "enabled" ] +if [ "${LH_SYMLINKS}" != "true" ] then exit 0 fi diff --git a/helpers/lh_chroot_sysfs b/helpers/lh_chroot_sysfs index d68f3e6..f6acb64 100755 --- a/helpers/lh_chroot_sysfs +++ b/helpers/lh_chroot_sysfs @@ -42,7 +42,7 @@ case "${1}" in # Creating lock file Create_lockfile .lock - if [ "${LH_USE_FAKEROOT}" != "enabled" ] + if [ "${LH_USE_FAKEROOT}" != "true" ] then # Create mountpoint mkdir -p chroot/sys @@ -67,7 +67,7 @@ case "${1}" in # Creating lock file Create_lockfile .lock - if [ "${LH_USE_FAKEROOT}" != "enabled" ] + if [ "${LH_USE_FAKEROOT}" != "true" ] then # Unmounting /sys #fuser -km chroot/sys diff --git a/helpers/lh_chroot_sysvinit b/helpers/lh_chroot_sysvinit index 0bd0db2..7c8c983 100755 --- a/helpers/lh_chroot_sysvinit +++ b/helpers/lh_chroot_sysvinit @@ -37,7 +37,7 @@ Check_lockfile .lock # Creating lock file Create_lockfile .lock -if [ "${LH_SYSVINIT}" = "enabled" ] +if [ "${LH_SYSVINIT}" = "true" ] then # Disable all for FILE in chroot/etc/init.d/* diff --git a/helpers/lh_config b/helpers/lh_config index 58729d2..da417a3 100755 --- a/helpers/lh_config +++ b/helpers/lh_config @@ -29,16 +29,16 @@ DESCRIPTION="$(Echo 'create configuration for live-helper(7)')" USAGE="${PROGRAM} [--apt apt|aptitude]\n\ \t [--apt-ftp-proxy URL]\n\ \t [--apt-http-proxy URL]\n\ -\t [--apt-pdiffs enabled|disabled]\n\ +\t [--apt-pdiffs true|false]\n\ \t [--apt-options OPTION|\"OPTIONS\"]\n\ \t [--aptitude-options OPTION|\"OPTIONS\"]\n\ \t [--apt-pipeline FIXME]\n\ -\t [--apt-recommends enabled|disabled]\n\ -\t [--apt-secure enabled|disabled]\n\ +\t [--apt-recommends true|false]\n\ +\t [--apt-secure true|false]\n\ \t [-a|--architecture ARCHITECTURE]\n\ \t [-b|--binary-images iso|net|tar|usb-hdd]\n\ \t [--binary-filesystem fat16|fat32]\n\ -\t [--binary-indices enabled|disabled|none]\n\ +\t [--binary-indices true|false|none]\n\ \t [--bootappend-install PARAMETER|\"PARAMETERS\"]\n\ \t [--bootappend-live PARAMETER|\"PARAMETERS\"]\n\ \t [--bootloader grub|syslinux|yaboot]\n\ @@ -47,26 +47,26 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\ \t [-f|--bootstrap-flavour minimal|standard]\n\ \t [--bootstrap-keyring PACKAGE]\n\ \t [--breakpoints]\n\ -\t [--cache enabled|disabled]\n\ -\t [--cache-indices enabled|disabled]\n\ -\t [--cache-packages enabled|disabled]\n\ +\t [--cache true|false]\n\ +\t [--cache-indices true|false]\n\ +\t [--cache-packages true|false]\n\ \t [--cache-stages STAGE|\"STAGES\"]\n\ -\t [--checksums enabled|disabled]\n\ -\t [--chroot-build enabled|disabled]\n\ +\t [--checksums true|false]\n\ +\t [--chroot-build true|false]\n\ \t [--chroot-filesystem ext2|ext3|squashfs|plain|jffs2]\n\ \t [-c|--conffile FILE]\n\ \t [--clean\n\ \t [--debconf-frontend dialog|editor|noninteractive|readline]\n\ -\t [--debconf-nowarnings enabled|disabled]\n\ +\t [--debconf-nowarnings true|false]\n\ \t [--debconf-priority low|medium|high|critical]\n\ -\t [--debian-installer enabled|cdrom|netinst|netboot|businesscard|live|disabled]\n\ +\t [--debian-installer true|cdrom|netinst|netboot|businesscard|live|false]\n\ \t [--debian-installer-distribution CODENAME|daily]\n\ \t [--debian-installer-preseedfile FILE|URL]\n\ -\t [--debian-installer-gui enabled|disabled]\n\ +\t [--debian-installer-gui true|false]\n\ \t [--debug]\n\ \t [-d|--distribution CODENAME]\n\ \t [--dump]\n\ -\t [-e|--encryption disabled|aes128|aes192|aes256]\n\ +\t [-e|--encryption false|aes128|aes192|aes256]\n\ \t [--fdisk fdisk|fdisk.dist]\n\ \t [--force]\n\ \t [--genisoimage genisomage|mkisofs]\n\ @@ -108,25 +108,25 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\ \t [--packages PACKAGE|\"PACKAGES\"]\n\ \t [--quiet]\n\ \t [--root-command sudo]\n\ -\t [--use-fakeroot enabled|disabled]\n\ +\t [--use-fakeroot true|false]\n\ \t [--archive-areas ARCHIVE_AREA|\"ARCHIVE_AREAS\"]\n\ -\t [--security enabled|disabled]\n\ -\t [--source enabled|disabled]\n\ +\t [--security true|false]\n\ +\t [--source true|false]\n\ \t [-s|--source-images iso|net|tar|usb-hdd]\n\ -\t [--symlinks enabled|disabled]\n\ +\t [--symlinks true|false]\n\ \t [--syslinux-splash FILE]\n\ \t [--syslinux-timeout SECONDS]\n\ -\t [--syslinux-menu enabled|disabled]\n\ -\t [--sysvinit enabled|disabled]\n\ +\t [--syslinux-menu true|false]\n\ +\t [--sysvinit true|false]\n\ \t [--tasksel aptitude|tasksel]\n\ \t [--tasks TASK]\n\ \t [--templates PATH]\n\ \t [--union-filesystem aufs|unionfs]\n\ \t [--virtual-root-size MB]\n\ -\t [--exposed-root enabled|disabled]\n\ +\t [--exposed-root true|false]\n\ \t [--username NAME]\n\ \t [--verbose]\n\ -\t [--win32-loader enabled|disabled]" +\t [--win32-loader true|false]" Local_arguments () { @@ -689,7 +689,7 @@ Local_arguments () # other --breakpoints) - _BREAKPOINTS="enabled" + _BREAKPOINTS="true" shift ;; @@ -699,17 +699,17 @@ Local_arguments () ;; --color) - _COLOR="enabled" + _COLOR="true" shift ;; --debug) - _DEBUG="enabled" + _DEBUG="true" shift ;; --force) - _FORCE="enabled" + _FORCE="true" shift ;; @@ -723,7 +723,7 @@ Local_arguments () ;; --quiet) - _QUIET="enabled" + _QUIET="true" shift ;; @@ -733,7 +733,7 @@ Local_arguments () ;; --verbose) - _VERBOSE="enabled" + _VERBOSE="true" shift ;; @@ -1105,7 +1105,7 @@ LH_CHECKSUMS="${LH_CHECKSUMS}" # \${LH_CHROOT_BUILD: control if we build binary images chrooted # (Default: ${LH_CHROOT_BUILD}) -# DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled. +# DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to false. LH_CHROOT_BUILD="${LH_CHROOT_BUILD}" # \$LH_DEBIAN_INSTALLER: set debian-installer diff --git a/helpers/lh_source_debian b/helpers/lh_source_debian index ef0449d..fef38a4 100755 --- a/helpers/lh_source_debian +++ b/helpers/lh_source_debian @@ -23,7 +23,7 @@ Arguments "${@}" Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source Set_defaults -if [ "${LH_SOURCE}" != "enabled" ] +if [ "${LH_SOURCE}" != "true" ] then exit 0 fi @@ -72,7 +72,7 @@ syslinux grub EOF - if [ "${LH_MEMTEST}" != "disabled" ] && [ "${LH_MEMTEST}" != "none" ] + if [ "${LH_MEMTEST}" != "false" ] && [ "${LH_MEMTEST}" != "none" ] then echo "${LH_MEMTEST}" >> source-selection.txt fi diff --git a/helpers/lh_source_debian-live b/helpers/lh_source_debian-live index ecd12fd..391f75e 100755 --- a/helpers/lh_source_debian-live +++ b/helpers/lh_source_debian-live @@ -23,7 +23,7 @@ Arguments "${@}" Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source Set_defaults -if [ "${LH_SOURCE}" != "enabled" ] +if [ "${LH_SOURCE}" != "true" ] then exit 0 fi diff --git a/helpers/lh_source_disk b/helpers/lh_source_disk index b52775f..a765bb4 100755 --- a/helpers/lh_source_disk +++ b/helpers/lh_source_disk @@ -83,7 +83,7 @@ case "${LH_DEBIAN_INSTALLER}" in echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/CD Source $(date +%Y%m%d-%H:%M)" > source/.disk/info ;; - enabled|netinst) + true|netinst) echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/NETINST Source $(date +%Y%m%d-%H:%M)" > source/.disk/info ;; @@ -95,7 +95,7 @@ case "${LH_DEBIAN_INSTALLER}" in echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/BC Source $(date +%Y%m%d-%H:%M)" > source/.disk/info ;; - disabled) + false) echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE Source $(date +%Y%m%d-%H:%M)" > source/.disk/info ;; esac diff --git a/helpers/lh_source_iso b/helpers/lh_source_iso index b65fae0..0ef1bcb 100755 --- a/helpers/lh_source_iso +++ b/helpers/lh_source_iso @@ -23,7 +23,7 @@ Arguments "${@}" Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source Set_defaults -if [ "${LH_SOURCE}" != "enabled" ] +if [ "${LH_SOURCE}" != "true" ] then exit 0 fi @@ -59,12 +59,12 @@ then rm -f source.iso fi -if [ "${_QUIET}" = "enabled" ] +if [ "${_QUIET}" = "true" ] then GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -quiet" fi -if [ "${_VERBOSE}" = "enabled" ] +if [ "${_VERBOSE}" = "true" ] then GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v" fi diff --git a/helpers/lh_source_md5sum b/helpers/lh_source_md5sum index 8f3fcdc..0034bfd 100755 --- a/helpers/lh_source_md5sum +++ b/helpers/lh_source_md5sum @@ -23,12 +23,12 @@ Arguments "${@}" Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source Set_defaults -if [ "${LH_SOURCE}" != "enabled" ] +if [ "${LH_SOURCE}" != "true" ] then exit 0 fi -if [ "${LH_CHECKSUMS}" != "enabled" ] +if [ "${LH_CHECKSUMS}" != "true" ] then exit 0 fi diff --git a/helpers/lh_source_net b/helpers/lh_source_net index f10db28..1c1b946 100755 --- a/helpers/lh_source_net +++ b/helpers/lh_source_net @@ -23,7 +23,7 @@ Arguments "${@}" Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source Set_defaults -if [ "${LH_SOURCE}" != "enabled" ] +if [ "${LH_SOURCE}" != "true" ] then exit 0 fi diff --git a/helpers/lh_source_tar b/helpers/lh_source_tar index d8cb41a..4923b71 100755 --- a/helpers/lh_source_tar +++ b/helpers/lh_source_tar @@ -23,7 +23,7 @@ Arguments "${@}" Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source Set_defaults -if [ "${LH_SOURCE}" != "enabled" ] +if [ "${LH_SOURCE}" != "true" ] then exit 0 fi diff --git a/helpers/lh_source_usb-hdd b/helpers/lh_source_usb-hdd index 1a88a60..e8cd8ca 100755 --- a/helpers/lh_source_usb-hdd +++ b/helpers/lh_source_usb-hdd @@ -23,7 +23,7 @@ Arguments "${@}" Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source Set_defaults -if [ "${LH_SOURCE}" != "enabled" ] +if [ "${LH_SOURCE}" != "true" ] then exit 0 fi diff --git a/helpers/lh_source_virtual-hdd b/helpers/lh_source_virtual-hdd index 59ee2b5..ac186dc 100755 --- a/helpers/lh_source_virtual-hdd +++ b/helpers/lh_source_virtual-hdd @@ -23,7 +23,7 @@ Arguments "${@}" Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source Set_defaults -if [ "${LH_SOURCE}" != "enabled" ] +if [ "${LH_SOURCE}" != "true" ] then exit 0 fi @@ -47,7 +47,7 @@ Check_lockfile .lock # Creating lock file Create_lockfile .lock -if [ "${LH_CHROOT_BUILD}" = "enabled" ] +if [ "${LH_CHROOT_BUILD}" = "true" ] then case "${LH_BINARY_FILESYSTEM}" in ext2|ext3) @@ -70,7 +70,7 @@ DU_DIM="$(du -ms source | cut -f1)" REAL_DIM="$(Calculate_partition_size ${DU_DIM} ${LH_BINARY_FILESYSTEM})" dd if=/dev/zero of=source-virtual.img bs=1024k count=0 seek=${REAL_DIM} -if [ "${LH_CHROOT_BUILD}" = "enabled" ] +if [ "${LH_CHROOT_BUILD}" = "true" ] then mv source-virtual.img chroot diff --git a/manpages/lh_config.en.1 b/manpages/lh_config.en.1 index 4abfba6..904caa8 100644 --- a/manpages/lh_config.en.1 +++ b/manpages/lh_config.en.1 @@ -12,7 +12,7 @@ lh_config \- create configuration for live\-helper .br [\fB\-\-apt\-http\-proxy\fR \fIURL\fR] .br - [\fB\-\-apt\-pdiffs\fR enabled|disabled] + [\fB\-\-apt\-pdiffs\fR true|false] .br [\fB\-\-apt\-options\fR \fIOPTION\fR|"\fIOPTIONS\fR"] .br @@ -20,9 +20,9 @@ lh_config \- create configuration for live\-helper .br [\fB\-\-apt\-pipeline\fR \fIDEPTH\fR] .br - [\fB\-\-apt\-recommends\fR enabled|disabled] + [\fB\-\-apt\-recommends\fR true|false] .br - [\fB\-\-apt\-secure\fR enabled|disabled] + [\fB\-\-apt\-secure\fR true|false] .br [\-a|\fB\-\-architecture\fR \fIARCHITECTURE\fR] .br @@ -30,7 +30,7 @@ lh_config \- create configuration for live\-helper .br [\fB\-\-binary\-filesystem\fR fat16|fat32|ext2] .br - [\fB\-\-binary\-indices\fR enabled|disabled|none] + [\fB\-\-binary\-indices\fR true|false|none] .br [\fB\-\-bootappend\-install\fR \fIPARAMETER\fR|\fI"PARAMETERS"\fR] .br @@ -46,17 +46,17 @@ lh_config \- create configuration for live\-helper .br [\fB\-\-bootstrap\-keyring\fR \fIPACKAGE\fR] .br - [\fB\-\-cache\fR enabled|disabled] + [\fB\-\-cache\fR true|false] .br - [\fB\-\-cache\-indices\fR enabled|disabled] + [\fB\-\-cache\-indices\fR true|false] .br - [\fB\-\-cache\-packages\fR enabled|disabled] + [\fB\-\-cache\-packages\fR true|false] .br [\fB\-\-cache\-stages\fR \fISTAGE\fR|\fI"STAGES"\fR] .br - [\fB\-\-checksums\fR enabled|disabled] + [\fB\-\-checksums\fR true|false] .br - [\fB\-\-chroot\-build\fR enabled|disabled] + [\fB\-\-chroot\-build\fR true|false] .br [\fB\-\-chroot\-filesystem\fR ext2|ext3|squashfs|plain|jffs2] .br @@ -66,23 +66,23 @@ lh_config \- create configuration for live\-helper .br [\fB\-\-debconf\-frontend\fR dialog|editor|noninteractive|readline] .br - [\fB\-\-debconf\-nowarnings\fR enabled|disabled] + [\fB\-\-debconf\-nowarnings\fR true|false] .br [\fB\-\-debconf\-priority\fR low|medium|high|critical] .br - [\fB\-\-debian\-installer\fR enabled|cdrom|netinst|netboot|businesscard|live|disabled] + [\fB\-\-debian\-installer\fR true|cdrom|netinst|netboot|businesscard|live|false] .br [\fB\-\-debian\-installer\-distribution\fR daily|\fICODENAME\fR] .br [\fB\-\-debian\-installer\-preseedfile\fR \fIFILE\fR|\fIURL\fR] .br - [\fB\-\-debian\-installer\-gui\fR enabled|disabled] + [\fB\-\-debian\-installer\-gui\fR true|false] .br [\-d|\fB\-\-distribution\fR \fICODENAME\fR] .br [\-\-\fBdump\fR] .br - [\-e|\fB\-\-encryption\fR disabled|aes128|aes192|aes256] + [\-e|\fB\-\-encryption\fR false|aes128|aes192|aes256] .br [\fB\-\-fdisk\fR fdisk|fdisk.dist] .br @@ -162,25 +162,25 @@ lh_config \- create configuration for live\-helper .br [\fB\-\-root-command\fR sudo] .br - [\fB\-\-use-fakeroot\fR enabled|disabled] + [\fB\-\-use-fakeroot\fR true|false] .br [\fB\-\-archive\-areas\fR \fIARCHIVE_AREA\fR|\fI"ARCHIVE_AREAS"\fR] .br - [\fB\-\-security\fR enabled|disabled] + [\fB\-\-security\fR true|false] .br - [\fB\-\-source\fR enabled|disabled] + [\fB\-\-source\fR true|false] .br [\-s|\fB\-\-source\-images\fR iso|net|tar|usb-hdd] .br - [\fB\-\-symlinks\fR enabled|disabled] + [\fB\-\-symlinks\fR true|false] .br [\fB\-\-syslinux\-splash\fR \fIFILE\fR] .br [\fB\-\-syslinux\-timeout\fR \fISECONDS\fR] .br - [\fB\-\-syslinux\-menu\fR enabled|disabled] + [\fB\-\-syslinux\-menu\fR true|false] .br - [\fB\-\-sysvinit\fR enabled|disabled] + [\fB\-\-sysvinit\fR true|false] .br [\fB\-\-tasksel\fR aptitude|tasksel] .br @@ -194,11 +194,11 @@ lh_config \- create configuration for live\-helper .br [\fB\-\-virtual\-root\-size \fIMB\fR] .br - [\fB\-\-exposed\-root\fR enabled|disabled] + [\fB\-\-exposed\-root\fR true|false] .br [\fB\-\-username\fR \fINAME\fR] .br - [\fB\-\-win32\-loader enabled|disabled] + [\fB\-\-win32\-loader true|false] .PP \fBlh_config\fR [\fIlive\-helper\ options\fR] @@ -216,26 +216,26 @@ defines if apt-get or aptitude is used to install packages when building the ima sets the ftp proxy to be used by apt. By default, this is empty but if the host has the environment variable ftp_proxy set, apt-ftp-proxy gets automatically set to the value of ftp_proxy. .IP "\fB\-\-apt\-http\-proxy\fR \fIURL\fR" 4 sets the http proxy to be used by apt. By default, this is empty but if the host has the environment variable http_proxy set, apt-http-proxy gets automatically set to the value of http_proxy. -.IP "\fB\-\-apt\-pdiffs\fR enabled|disabled" 4 -defines whetever apt should use incremental package indices feature or not. This is enabled by default. +.IP "\fB\-\-apt\-pdiffs\fR true|false" 4 +defines whetever apt should use incremental package indices feature or not. This is true by default. .IP "\fB\-\-apt\-options\fR \fIOPTION\fR|""\fIOPTIONS\fR""" 4 defines the default options that will be appended to every apt call that is made inside chroot during the building of the image. By default, this is set to \-\-yes to allow non-interactive installation of packages. .IP "\fB\-\-aptitude\-options\fR \fIOPTION\fR|""\fIOPTIONS\fR""" 4 defines the default options that will be appended to every aptitude call that is made inside chroot during building of the image. By default, this is set to \-\-assume\-yes to allow non-interactive installation of packages. .IP "\fB\-\-apt\-pipeline\fR \fIDEPTH\fR" 4 sets the depth of the apt/aptitude pipeline. In cases where the remote server is not RFC conforming or buggy (such as Squid 2.0.2) this option can be a value from 0 to 5 indicating how many outstanding requests APT should send. A value of zero MUST be specified if the remote host does not properly linger on TCP connections - otherwise data corruption will occur. Hosts which require this are in violation of RFC 2068. By default, live-helper does not set this option. -.IP "\fB\-\-apt\-recommends\fR enabled|disabled" 4 -defines if apt should install recommended packages automatically. By default, this is enabled except in emdebian mode. -.IP "\fB\-\-apt\-secure\fR enabled|disabled" 4 -defines if apt should check repository signatures. This is enabled by default. +.IP "\fB\-\-apt\-recommends\fR true|false" 4 +defines if apt should install recommended packages automatically. By default, this is true except in emdebian mode. +.IP "\fB\-\-apt\-secure\fR true|false" 4 +defines if apt should check repository signatures. This is true by default. .IP "\-a|\fB\-\-architecture\fR \fIARCHITECTURE\fR" 4 defines the architecture of the to be build image. By default, this is set to the host architecture. Note that you cannot crossbuild for another architecture if your host system is not able to execute binaries for the target architecture natively. For example, building amd64 images on i386 and vice versa is possile if you have a 64bit capable i386 processor and the right kernel. But building powerpc images on an i386 system is not possible. .IP "\-b|\fB\-\-binary\-images\fR iso|net|tar|usb\-hdd" 4 defines the image type to build. By default this is set to iso to build CD/DVD images. .IP "\fB\-\-binary\-filesystem\fR fat16|fat32|ext2" 4 defines the filesystem to be used in the image type. This only has an effect if the selected binary image type does allow to choose a filesystem. For example, when selection iso the resulting CD/DVD has always the filesystem ISO9660. When building usb-hdd images for usb sticks, this is active. Note that it defaults to fat16 on all architectures except sparc where it defaults to ext2. Also note that if you choose fat16 and your resulting binary image gets bigger than 2GB, the binary filesystem automatically gets switched to fat32. -.IP "\fB\-\-binary\-indices\fR enabled|disabled|none" 4 -defines if the resulting images should have binary indices or not and defaults to enabled. If set to none, no indices are included at all. +.IP "\fB\-\-binary\-indices\fR true|false|none" 4 +defines if the resulting images should have binary indices or not and defaults to true. If set to none, no indices are included at all. .IP "\fB\-\-bootappend\-install\fR \fIPARAMETER\fR|\fI""PARAMETERS""\fR" 4 sets boot parameters specific to debian-installer, if included. .IP "\fB\-\-bootappend\-live\fR \fIPARAMETER\fR|\fI""PARAMETERS""\fR" 4 @@ -250,17 +250,17 @@ sets a custom configuration file for the boostrap programm of choice and is empt defines if the bootstrap program should bootstrap the standard system (all packages of priority required and important, which is the default) or a minimal system (only packages of priority required, plus apt). .IP "\fB\-\-bootstrap\-keyring\fR \fIPACKAGE\fR" 4 sets the archive keyring package to be used. Default is debian-archive-keyring. -.IP "\fB\-\-cache\fR enabled|disabled" 4 +.IP "\fB\-\-cache\fR true|false" 4 defines globally if any cache should be used at all. Different caches can be controled through the their own options. -.IP "\fB\-\-cache\-indices\fR enabled|disabled" 4 -defines if downloaded package indices and lists should be cached which is disabled by default. Enabling it would allow to rebuild an image completely offline, however, you would not get updates anymore then. -.IP "\fB\-\-cache\-packages\fR enabled|disabled" 4 -defines if downloaded packages files should be cached which is enabled by default. Disabling it does save space consumtion in your build directory, but remember that you will cause much unnecessary traffic if you do a couple of rebuilds. In general you should always leave it enabled, however, in some particular rare build setups, it can be faster to refetch packages from the local network mirror rather than to utilize the local disk. -.IP "\fB\-\-cache\-stages\fR enabled|disabled|\fISTAGE\fR|\fI""STAGES""\fR" 4 +.IP "\fB\-\-cache\-indices\fR true|false" 4 +defines if downloaded package indices and lists should be cached which is false by default. Enabling it would allow to rebuild an image completely offline, however, you would not get updates anymore then. +.IP "\fB\-\-cache\-packages\fR true|false" 4 +defines if downloaded packages files should be cached which is true by default. Disabling it does save space consumtion in your build directory, but remember that you will cause much unnecessary traffic if you do a couple of rebuilds. In general you should always leave it true, however, in some particular rare build setups, it can be faster to refetch packages from the local network mirror rather than to utilize the local disk. +.IP "\fB\-\-cache\-stages\fR true|false|\fISTAGE\fR|\fI""STAGES""\fR" 4 sets which stages should be cached. By default set to bootstrap. As an exception to the normal stage names, also rootfs can be used here which does only cache the generated root filesystem in filesystem.{dir,ext*,squashfs}. This is useful during development if you want to rebuild the binary stage but not regenerate the root filesystem all the time. -.IP "\fB\-\-checksums\fR enabled|disabled" 4 -defines if the binary image should contain a file called md5sums.txt that lists all files on the image together with their md5 checksums. This in turn can be used by live-initramfs' built-in integrity-check to verify the medium if specified at boot prompt. In general, this should not be disabled and is an important feature of live system released to the public. However, during development of very big images it can save some time by not calculating the checksums. -.IP "\fB\-\-chroot\-build\fR enabled|disabled" 4 +.IP "\fB\-\-checksums\fR true|false" 4 +defines if the binary image should contain a file called md5sums.txt that lists all files on the image together with their md5 checksums. This in turn can be used by live-initramfs' built-in integrity-check to verify the medium if specified at boot prompt. In general, this should not be false and is an important feature of live system released to the public. However, during development of very big images it can save some time by not calculating the checksums. +.IP "\fB\-\-chroot\-build\fR true|false" 4 defines whetever live-helper should use the tools from within the chroot to build the binary image or not by using and including the host systems tools. This is a very dangerous option, using the tools of the host system can lead to tainted and even non-bootable images if the host systems version of the required tools (mainly these are the bootloaders such as syslinux, grub and yaboot, and the auxilliary tools such as dosfstools, genisoimage, squashfs-tools and others) do not \fBexactely\fR match what is present at build-time in the target distribution. Never do disable this option unless you are \fBexactely\fR sure what you are doing and have \fBcompletely\fI understood its consequences. .IP "\fB\-\-chroot\-filesystem\fR ext2|ext3|squashfs|plain|jffs2" 4 defines which filesystem type should be used for the root filesystem image. If you use plain, then no filesystem image is created and the root filesystem content is copied on the binary image filesystem as flat files. Depending on what binary filesystem you have choosen, it may not be possible to build with a plain root filesystem, e.g. fat16/fat32 and plain don't work as linux does not support to run on them. @@ -270,24 +270,24 @@ minimizes config directory by automatically removing unused and thus empty subdi using a user specified alternative configuration file in addition to the normally used one in the config directory. .IP "\fB\-\-debconf\-frontend\fR dialog|editor|noninteractive|readline" 4 defines what value the debconf frontend should be set to inside the chroot. Note that setting it to anything by noninteractive, which is the default, makes your build asking questions during the build. -.IP "\fB\-\-debconf\-nowarnings\fR enabled|disabled" 4 +.IP "\fB\-\-debconf\-nowarnings\fR true|false" 4 defines if warnings of debconf should be displayed or not. Warnings from debconf are generally very rare and by default, we skipp them, if any, in order to keep the build process entirely non interactive. .IP "\fB\-\-debconf\-priority\fR low|medium|high|critical" 4 defines what value the debconf priority shoul dbe set to inside the chroot. By default, it is set to critical, which means that almost no questions are displayed. Note that this only has an effect if you use any debconf frontend different from noninteractive. -.IP "\fB\-\-debian\-installer\fR enabled|cdrom|netinst|netboot|businesscard|live|disabled" 4 +.IP "\fB\-\-debian\-installer\fR true|cdrom|netinst|netboot|businesscard|live|false" 4 defines which type, if any, of the debian\-installer should be included in the resulting binary image. By default, no installer is included. All available flavours except live are the identical configurations used on the installer media produced by regular debian\-cd. When live is choosen, the live\-installer udeb is included so that debian\-installer will behave different than usual - instead of installing the debian system from packages from the medium or the network, it installs the live system to the disk. .IP "\fB\-\-debian\-installer\-distribution\fR daily|\fICODENAME\fR" 4 defines the distribution where the debian\-installer files should be taken out from. Normally, this should be set to the same distribution as the live system. However, some times, one wants to use a newer or even daily built installer. .IP "\fB\-\-debian\-installer\-preseedfile\fR \fIFILE\fR|\fIURL\fR" 4 sets the filename or URL for an optionally used and included preseeding file for debian\-installer. -.IP "\fB\-\-debian\-installer\-gui\fR enabled|disabled" 4 -defines if the debian\-installer graphical GTK interface should be enabled or not. In Debian mode and for most versions of Ubuntu, this option is enabled, whereas otherwise disabled, by default. +.IP "\fB\-\-debian\-installer\-gui\fR true|false" 4 +defines if the debian\-installer graphical GTK interface should be true or not. In Debian mode and for most versions of Ubuntu, this option is true, whereas otherwise false, by default. .IP "\-d|\fB\-\-distribution\fR \fICODENAME\fR" 4 defines the distribution of the resulting live system. .IP "\-\-\fBdump\fR" 4 prepares a report of the currently present live system configuration and the version of live\-helper used. This is useful to provide if you submit bug reports, we do get all informations required for us to locate and replicate an error. -.IP "\-e|\fB\-\-encryption\fR disabled|aes128|aes192|aes256" 4 -defines if the root filesystem should be encrypted or not. By default, this is disabled. +.IP "\-e|\fB\-\-encryption\fR false|aes128|aes192|aes256" 4 +defines if the root filesystem should be encrypted or not. By default, this is false. .IP "\fB\-\-fdisk\fR fdisk|fdisk.dist" 4 sets the filename of the fdisk binary from the host system that should be used. This is autodetected and does generally not need any customization. .IP "\fB\-\-genisoimage\fR genisomage|mkisofs" 4 @@ -307,7 +307,7 @@ sets the path to the includes that live\-helper is going to use, e.g. additional .IP "\fB\-\-initramfs\fR auto|live\-initramfs|casper" 4 sets the name of package that contains the live system specific initramfs modification. By default, auto is used, which means that at build time of the image rather than on configuration time, the value will be expanded to casper when building etch systems and to live\-initramfs for all other systems. .IP "\fB\-\-interactive\fR shell" 4 -defines if after the chroot stage and before the beginning of the binary stage, a interactive shell login should be spawned in the chroot in order to allow you to do manual customizations. Once you close the shell with logout or exit, the build will continue as usual. Note that it's strongly discouraged to use this for anything else than testing. Modifications that should be present in all builds of a live system should be properly made through hooks. Everything else destroys the beauty of being able to completely automatise the build process and making it non interactive. By default, this is of course disabled. +defines if after the chroot stage and before the beginning of the binary stage, a interactive shell login should be spawned in the chroot in order to allow you to do manual customizations. Once you close the shell with logout or exit, the build will continue as usual. Note that it's strongly discouraged to use this for anything else than testing. Modifications that should be present in all builds of a live system should be properly made through hooks. Everything else destroys the beauty of being able to completely automatise the build process and making it non interactive. By default, this is of course false. .IP "\fB\-\-iso\-application\fR \fINAME\fR" 4 sets the APPLICATION field in the header of a resulting CD/DVD image and defaults to "Debian Live" in debian mode, and to "Emdebian Live" in emdebian mode, and "Ubuntu Live" in ubuntu mode. .IP "\fB\-\-iso\-preparer\fR \fINAME\fR" 4 @@ -373,26 +373,26 @@ defines which lists available in /usr/share/live-helper/lists should be used. By defines one or more packages to be installed in the live system. This is a quick and convenient place to add a few packages when building an image (limited by the max length of shell). Packages that should be permanently installed should be put into a local packages list. .IP "\fB\-\-root-command\fR sudo" 4 controls if live-helper should use sudo internally to build the live image. Note that this is not well tested and that you should, when relying on sudo, call the individual live\-helper command with sudo itself. -.IP "\fB\-\-use-fakeroot\fR enabled|disabled" 4 -controls if live-helper should utilize fakeroot and fakechroot to try and avoid requiring root privillages where possible. By default, this option is disabled. +.IP "\fB\-\-use-fakeroot\fR true|false" 4 +controls if live-helper should utilize fakeroot and fakechroot to try and avoid requiring root privillages where possible. By default, this option is false. .IP "\fB\-\-archive\-areas\fR \fIARCHIVE_AREA\fR|\fI""ARCHIVE_AREAS""\fR" 4 defines which package archive areas of a debian packages archive should be used for configured debian package mirrors. By default, this is set to main. Remember to check the licenses of each packages with respect to their redistributability in your juristiction when enabling contrib or non-free with this mechanism. -.IP "\fB\-\-security\fR enabled|disabled" 4 +.IP "\fB\-\-security\fR true|false" 4 defines if the security repositories specified in the security mirror options should be used or not. -.IP "\fB\-\-source\fR enabled|disabled" 4 -defines if a corresponding source image to the binary image should be build. By default this is disabled because most people do not require this and would require to download quite a few source packages. However, once you start distributing your live image, you should make sure you build it with a source image alongside. +.IP "\fB\-\-source\fR true|false" 4 +defines if a corresponding source image to the binary image should be build. By default this is false because most people do not require this and would require to download quite a few source packages. However, once you start distributing your live image, you should make sure you build it with a source image alongside. .IP "\-s|\fB\-\-source\-images\fR iso|net|tar|usb-hdd" 4 defines the image type for the source image. Default is tar. -.IP "\fB\-\-symlinks\fR enabled|disabled" 4 -defines if the symlink hack should be enabled or disabled. The symlink hack converts all absolute symlinks to relative ones. By default this is disabled and in general there is no need or gain to enable it. If you are in a special situation that requires this, you will know. +.IP "\fB\-\-symlinks\fR true|false" 4 +defines if the symlink hack should be true or false. The symlink hack converts all absolute symlinks to relative ones. By default this is false and in general there is no need or gain to enable it. If you are in a special situation that requires this, you will know. .IP "\fB\-\-syslinux\-splash\fR \fIFILE\fR" 4 defines the file of the syslinux splash graphic that should be used instead of the default one. .IP "\fB\-\-syslinux\-timeout\fR \fISECONDS\fR" 4 defines the timeout the syslinux bootloader should wait for input from the user at the bootprompt prior booting the default kernel. This defaults to 0 which means it will wait forever. -.IP "\fB\-\-syslinux\-menu\fR enabled|disabled" 4 +.IP "\fB\-\-syslinux\-menu\fR true|false" 4 defines if syslinux should be make use of the vgamenu capabilities or not. -.IP "\fB\-\-sysvinit\fR enabled|disabled" 4 -defines it the sysvinit hack should be enabled or disabled. The sysvinit hack disables all non-essential services from starting up at bootup in order to reduce overall boottime. By default this is disabled and in general there you don't want to enable it. +.IP "\fB\-\-sysvinit\fR true|false" 4 +defines it the sysvinit hack should be true or false. The sysvinit hack disables all non-essential services from starting up at bootup in order to reduce overall boottime. By default this is false and in general there you don't want to enable it. .IP "\fB\-\-tasksel\fR aptitude|tasksel" 4 selects which program is used to install tasks. By default, this is set to tasksel. .IP "\fB\-\-tasks\fR \fITASK\fR|""\fITASKS\fR""" 4 @@ -405,11 +405,11 @@ defines whetever to use UnionFS or Aufs as stackable unification filesystem. Whe defines what filesystem to format the root filesystem when building virtual-hdd images. .IP "\fB\-\-virtual\-root\-size\fR MB" 4 defines what size the virtual-hdd image should be. Note that although the default is set to 10000 (= 10GB), it will not need 10GB space on your harddisk as the files are created as sparse files. -.IP "\fB\-\-exposed\-root\fR enabled|disabled" 4 -defines whether to expose the root filesystem as read only and not covered by the union filesystem. This has useful implications for certain speciality setups such as LTSP. By default, this option is disabled. +.IP "\fB\-\-exposed\-root\fR true|false" 4 +defines whether to expose the root filesystem as read only and not covered by the union filesystem. This has useful implications for certain speciality setups such as LTSP. By default, this option is false. .IP "\fB\-\-username\fR \fINAME\fR" 4 sets the name of the account of the default user in the live system. -.IP "\fB\-\-win32\-loader enabled|disabled" 4 +.IP "\fB\-\-win32\-loader true|false" 4 defines if win32\-loader should be included in the binary image or not. .SH ENVIRONMENT @@ -418,7 +418,7 @@ All command line switches can also be specified through the corresponding enviro .SH FILES .I /etc/default/live-helper .PP -An optional, global configuration file for lh_config variables. It is useful to specify a few system wide defaults, like LH_MIRROR_BOOTSTRAP. This feature can be disabled by specifying the \fB\-\-ignore\-system\-defaults\fR option. +An optional, global configuration file for lh_config variables. It is useful to specify a few system wide defaults, like LH_MIRROR_BOOTSTRAP. This feature can be false by specifying the \fB\-\-ignore\-system\-defaults\fR option. .SH SEE ALSO \fIlive\-helper\fR(7) -- cgit v1.0