diff options
| author | Daniel Baumann <daniel@debian.org> | 2008-11-01 14:59:51 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:03:43 +0100 |
| commit | cb0894b3b3d13da593a36cd45d5e0383adfd78f8 (patch) | |
| tree | fd84aeed9e23f7bd7d36c545d44604954f831bb9 /helpers | |
| parent | 3ff1c8050b9e32837fcaad6fbc4e9981f9cbdffd (diff) | |
| download | vyos-live-build-cb0894b3b3d13da593a36cd45d5e0383adfd78f8.tar.gz vyos-live-build-cb0894b3b3d13da593a36cd45d5e0383adfd78f8.zip | |
Generalizing internal LH_QUIET variable.
Diffstat (limited to 'helpers')
| -rwxr-xr-x | helpers/lh_binary_debian-installer | 2 | ||||
| -rwxr-xr-x | helpers/lh_binary_iso | 2 | ||||
| -rwxr-xr-x | helpers/lh_binary_rootfs | 2 | ||||
| -rwxr-xr-x | helpers/lh_bootstrap_cdebootstrap | 2 | ||||
| -rwxr-xr-x | helpers/lh_config | 13 | ||||
| -rwxr-xr-x | helpers/lh_source_iso | 2 |
6 files changed, 9 insertions, 14 deletions
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer index cac39c68b..8d6906304 100755 --- a/helpers/lh_binary_debian-installer +++ b/helpers/lh_binary_debian-installer @@ -31,7 +31,7 @@ Set_defaults if [ "${_DEBUG}" = "enabled" ] then WGET_OPTIONS="${WGET_OPTIONS} --verbose" -elif [ "${LH_QUIET}" = "enabled" ] +elif [ "${_QUIET}" = "enabled" ] then WGET_OPTIONS="${WGET_OPTIONS} --quiet" else diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso index 7842d3095..549692b3b 100755 --- a/helpers/lh_binary_iso +++ b/helpers/lh_binary_iso @@ -66,7 +66,7 @@ fi GENISOIMAGE_OPTIONS="-J -l -cache-inodes -allow-multidot" # Handle genisoimage live-helper specific options -if [ "${LH_QUIET}" = "enabled" ] +if [ "${_QUIET}" = "enabled" ] then GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -quiet" fi diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs index d6ab9577c..5529a0279 100755 --- a/helpers/lh_binary_rootfs +++ b/helpers/lh_binary_rootfs @@ -244,7 +244,7 @@ case "${LH_CHROOT_FILESYSTEM}" in # Remove stale squashfs image rm -f chroot/filesystem.squashfs - if [ "${LH_QUIET}" = "enabled" ] && [ "${LH_DISTRIBUTION}" != "etch" ] + if [ "${_QUIET}" = "enabled" ] && [ "${LH_DISTRIBUTION}" != "etch" ] then MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -no-progress" fi diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/lh_bootstrap_cdebootstrap index c2ab3f3fe..06a18fa96 100755 --- a/helpers/lh_bootstrap_cdebootstrap +++ b/helpers/lh_bootstrap_cdebootstrap @@ -109,7 +109,7 @@ then CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --debug" fi -if [ "${LH_QUIET}" = "enabled" ] +if [ "${_QUIET}" = "enabled" ] then CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --quiet" fi diff --git a/helpers/lh_config b/helpers/lh_config index 31f98342d..6cc9b58a2 100755 --- a/helpers/lh_config +++ b/helpers/lh_config @@ -322,11 +322,6 @@ Local_arguments () shift ;; - --quiet) - LH_QUIET="enabled" - shift - ;; - --verbose) LH_VERBOSE="enabled" shift @@ -682,7 +677,7 @@ Local_arguments () ;; --quiet) - LH_QUIET="enabled" + _QUIET="enabled" shift ;; @@ -856,9 +851,9 @@ LH_TEMPLATES="${LH_TEMPLATES}" # (Default: ${_FORCE}) #_FORCE="${_FORCE}" -# \$LH_QUIET: enable quiet -# (Default: ${LH_QUIET}) -LH_QUIET="${LH_QUIET}" +# \$_QUIET: enable quiet +# (Default: ${_QUIET}) +_QUIET="${_QUIET}" # \$LH_VERBOSE: enable verbose # (Default: ${LH_VERBOSE}) diff --git a/helpers/lh_source_iso b/helpers/lh_source_iso index 585e81207..bd8ffd8c8 100755 --- a/helpers/lh_source_iso +++ b/helpers/lh_source_iso @@ -64,7 +64,7 @@ then rm -f source.iso fi -if [ "${LH_QUIET}" = "enabled" ] +if [ "${_QUIET}" = "enabled" ] then GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -quiet" fi |