diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-05-21 10:55:55 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:17:09 +0100 |
| commit | 36bddd25da6519e9d6effa254106e54de87bd711 (patch) | |
| tree | 72adc8c725a94ed8d941f1ac43c4b7a600dff8ae /functions | |
| parent | 34798918306e7aa5d080e274a5d58c8b5fa983e8 (diff) | |
| download | vyos-live-build-36bddd25da6519e9d6effa254106e54de87bd711.tar.gz vyos-live-build-36bddd25da6519e9d6effa254106e54de87bd711.zip | |
Renaming --chroot-build to --build-with-chroot.
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/defaults.sh | 2 | ||||
| -rwxr-xr-x | functions/packages.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 6c4444f32..e16635dae 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -817,7 +817,7 @@ Set_defaults () LH_CHECKSUMS="${LH_CHECKSUMS:-md5}" # Setting chroot option - LH_CHROOT_BUILD="${LH_CHROOT_BUILD:-true}" + LH_BUILD_WITH_CHROOT="${LH_BUILD_WITH_CHROOT:-true}" # Setting debian-installer option LH_DEBIAN_INSTALLER="${LH_DEBIAN_INSTALLER:-false}" diff --git a/functions/packages.sh b/functions/packages.sh index 7d7f5f9e2..4b833ce53 100755 --- a/functions/packages.sh +++ b/functions/packages.sh @@ -28,7 +28,7 @@ Check_package () Install_package () { - if [ -n "${_LH_PACKAGES}" ] && [ "${LH_CHROOT_BUILD}" != "false" ] + if [ -n "${_LH_PACKAGES}" ] && [ "${LH_BUILD_WITH_CHROOT}" != "false" ] then case "${LH_APT}" in apt|apt-get) @@ -44,7 +44,7 @@ Install_package () Remove_package () { - if [ -n "${_LH_PACKAGES}" ] && [ "${LH_CHROOT_BUILD}" != "false" ] + if [ -n "${_LH_PACKAGES}" ] && [ "${LH_BUILD_WITH_CHROOT}" != "false" ] then case "${LH_APT}" in apt|apt-get) @@ -68,7 +68,7 @@ Check_installed () FILE="${1}" PACKAGE="${2}" - case "${LH_CHROOT_BUILD}" in + case "${LH_BUILD_WITH_CHROOT}" in true) if Chroot chroot "dpkg-query -s ${PACKAGE}" 2> /dev/null | grep -qs "Status: install" then |