summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-10-04 22:08:31 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:22:27 +0100
commita81c2201bd5cfa3c632ffd5828e908f579aa5d95 (patch)
tree5bfba61fdb21850ef1d413c045206e18dbc7b634
parent732ed2801e13f3232ab2cf0777e25c73c391e59e (diff)
downloadlive-build-a81c2201bd5cfa3c632ffd5828e908f579aa5d95.zip
live-build-a81c2201bd5cfa3c632ffd5828e908f579aa5d95.tar.gz
Respecting LH_QUIET for cdebootstrap calls, thanks to Justin Pryzby <pryzbyj@justinpryzby.com>.
-rwxr-xr-xhelpers/lh_bootstrap_cdebootstrap8
-rwxr-xr-xhelpers/lh_config2
2 files changed, 6 insertions, 4 deletions
diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/lh_bootstrap_cdebootstrap
index 225b24d..b192858 100755
--- a/helpers/lh_bootstrap_cdebootstrap
+++ b/helpers/lh_bootstrap_cdebootstrap
@@ -81,17 +81,17 @@ else
CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=minimal"
fi
-if [ "${LH_DEBUG}" = "true" ]
+if [ "${LH_DEBUG}" = "enabled" ]
then
CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --debug"
fi
-if [ "${LH_QUIET}" = "true" ]
+if [ "${LH_QUIET}" = "enabled" ]
then
CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --quiet"
fi
-if [ "${LH_VERBOSE}" = "true" ]
+if [ "${LH_VERBOSE}" = "enabled" ]
then
CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --verbose"
fi
@@ -127,7 +127,9 @@ then
fi
# Executing cdebootstrap (regular run)
+ [ "$LH_QUIET" = "enabled" ] && echo -n "Running cdebootstrap ... "
${LH_ROOT_COMMAND} cdebootstrap ${CDEBOOTSTRAP_OPTIONS} "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}"
+ [ "$LH_QUIET" = "enabled" ] && echo "done."
if [ -n "${LH_ROOT_COMMAND}" ]
then
diff --git a/helpers/lh_config b/helpers/lh_config
index 0c4c256..bfcb316 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -703,7 +703,7 @@ LH_TEMPLATES="${LH_TEMPLATES}"
# \$LH_QUIET: enable quiet
# (Default: ${LH_QUIET})
-#LH_QUIET="${LH_QUIET}"
+LH_QUIET="${LH_QUIET}"
# \$LH_VERBOSE: enable verbose
# (Default: ${LH_VERBOSE})