summaryrefslogtreecommitdiff
path: root/helpers
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2008-04-07 12:10:21 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:03:31 +0100
commit26fc30d8eb164a2d46ea31add932629398519c8e (patch)
tree8f45ad2d177d3c2792e256198053ee28d8e3b5bb /helpers
parent0466a3bda47a07e72e40648e5318567af389364c (diff)
downloadvyos-live-build-26fc30d8eb164a2d46ea31add932629398519c8e.tar.gz
vyos-live-build-26fc30d8eb164a2d46ea31add932629398519c8e.zip
Using new Read_conffile(); now.
Diffstat (limited to 'helpers')
-rwxr-xr-xhelpers/lh_binary8
-rwxr-xr-xhelpers/lh_binary_chroot8
-rwxr-xr-xhelpers/lh_binary_debian-installer8
-rwxr-xr-xhelpers/lh_binary_disk8
-rwxr-xr-xhelpers/lh_binary_encryption8
-rwxr-xr-xhelpers/lh_binary_grub8
-rwxr-xr-xhelpers/lh_binary_includes8
-rwxr-xr-xhelpers/lh_binary_iso8
-rwxr-xr-xhelpers/lh_binary_linux-image8
-rwxr-xr-xhelpers/lh_binary_local-hooks8
-rwxr-xr-xhelpers/lh_binary_local-includes8
-rwxr-xr-xhelpers/lh_binary_local-packageslists8
-rwxr-xr-xhelpers/lh_binary_manifest8
-rwxr-xr-xhelpers/lh_binary_md5sum8
-rwxr-xr-xhelpers/lh_binary_memtest8
-rwxr-xr-xhelpers/lh_binary_net8
-rwxr-xr-xhelpers/lh_binary_rootfs8
-rwxr-xr-xhelpers/lh_binary_syslinux8
-rwxr-xr-xhelpers/lh_binary_tar8
-rwxr-xr-xhelpers/lh_binary_usb-hdd8
-rwxr-xr-xhelpers/lh_binary_yaboot8
-rwxr-xr-xhelpers/lh_bootstrap8
-rwxr-xr-xhelpers/lh_bootstrap_cache8
-rwxr-xr-xhelpers/lh_bootstrap_cdebootstrap8
-rwxr-xr-xhelpers/lh_bootstrap_copy8
-rwxr-xr-xhelpers/lh_bootstrap_debootstrap8
-rwxr-xr-xhelpers/lh_chroot8
-rwxr-xr-xhelpers/lh_chroot_apt8
-rwxr-xr-xhelpers/lh_chroot_cache8
-rwxr-xr-xhelpers/lh_chroot_debianchroot8
-rwxr-xr-xhelpers/lh_chroot_devpts8
-rwxr-xr-xhelpers/lh_chroot_dpkg8
-rwxr-xr-xhelpers/lh_chroot_hacks8
-rwxr-xr-xhelpers/lh_chroot_hooks8
-rwxr-xr-xhelpers/lh_chroot_hostname8
-rwxr-xr-xhelpers/lh_chroot_hosts8
-rwxr-xr-xhelpers/lh_chroot_interactive8
-rwxr-xr-xhelpers/lh_chroot_linux-image8
-rwxr-xr-xhelpers/lh_chroot_local-hooks8
-rwxr-xr-xhelpers/lh_chroot_local-includes8
-rwxr-xr-xhelpers/lh_chroot_local-packages8
-rwxr-xr-xhelpers/lh_chroot_local-packageslists8
-rwxr-xr-xhelpers/lh_chroot_local-preseed8
-rwxr-xr-xhelpers/lh_chroot_localization8
-rwxr-xr-xhelpers/lh_chroot_packages8
-rwxr-xr-xhelpers/lh_chroot_packageslists8
-rwxr-xr-xhelpers/lh_chroot_preseed8
-rwxr-xr-xhelpers/lh_chroot_proc8
-rwxr-xr-xhelpers/lh_chroot_resolv8
-rwxr-xr-xhelpers/lh_chroot_sources8
-rwxr-xr-xhelpers/lh_chroot_symlinks8
-rwxr-xr-xhelpers/lh_chroot_sysfs8
-rwxr-xr-xhelpers/lh_chroot_sysv-rc8
-rwxr-xr-xhelpers/lh_chroot_sysvinit8
-rwxr-xr-xhelpers/lh_chroot_tasks8
-rwxr-xr-xhelpers/lh_clean8
-rwxr-xr-xhelpers/lh_config8
-rwxr-xr-xhelpers/lh_source8
-rwxr-xr-xhelpers/lh_source_debian8
-rwxr-xr-xhelpers/lh_source_debian-live8
-rwxr-xr-xhelpers/lh_source_disk8
-rwxr-xr-xhelpers/lh_source_iso8
-rwxr-xr-xhelpers/lh_source_md5sum8
-rwxr-xr-xhelpers/lh_source_net8
-rwxr-xr-xhelpers/lh_source_tar8
-rwxr-xr-xhelpers/lh_source_usb-hdd8
-rwxr-xr-xhelpers/lh_testroot8
67 files changed, 67 insertions, 469 deletions
diff --git a/helpers/lh_binary b/helpers/lh_binary
index 2cc5ce0df..e8ca415b4 100755
--- a/helpers/lh_binary
+++ b/helpers/lh_binary
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
# Preparing root filesystem
diff --git a/helpers/lh_binary_chroot b/helpers/lh_binary_chroot
index 32b4aab58..e78c725be 100755
--- a/helpers/lh_binary_chroot
+++ b/helpers/lh_binary_chroot
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
Echo_message "Begin copying chroot..."
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 04f943568..8a19f1ccf 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
if [ "${LH_QUIET}" = "enabled" ]
diff --git a/helpers/lh_binary_disk b/helpers/lh_binary_disk
index ab0b2dc8d..04db1ac51 100755
--- a/helpers/lh_binary_disk
+++ b/helpers/lh_binary_disk
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
if [ "${LH_BINARY_IMAGES}" != "iso" ]
diff --git a/helpers/lh_binary_encryption b/helpers/lh_binary_encryption
index 62a6c0aaf..22db1df9b 100755
--- a/helpers/lh_binary_encryption
+++ b/helpers/lh_binary_encryption
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
case "${LH_ENCRYPTION}" in
diff --git a/helpers/lh_binary_grub b/helpers/lh_binary_grub
index 974fc03fd..2cedaa43c 100755
--- a/helpers/lh_binary_grub
+++ b/helpers/lh_binary_grub
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
if [ "${LH_BOOTLOADER}" != "grub" ]
diff --git a/helpers/lh_binary_includes b/helpers/lh_binary_includes
index 24c9e5dcc..ba628efea 100755
--- a/helpers/lh_binary_includes
+++ b/helpers/lh_binary_includes
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
if [ "${LH_INCLUDES}" = "none" ]
diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso
index 9bc844b65..aa2e6dbec 100755
--- a/helpers/lh_binary_iso
+++ b/helpers/lh_binary_iso
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
if ! echo "${LH_BINARY_IMAGES}" | grep -qs iso
diff --git a/helpers/lh_binary_linux-image b/helpers/lh_binary_linux-image
index 308d8ae6c..04190909f 100755
--- a/helpers/lh_binary_linux-image
+++ b/helpers/lh_binary_linux-image
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
Echo_message "Begin install linux-image..."
diff --git a/helpers/lh_binary_local-hooks b/helpers/lh_binary_local-hooks
index d1644159e..455e86bdb 100755
--- a/helpers/lh_binary_local-hooks
+++ b/helpers/lh_binary_local-hooks
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
Echo_message "Begin executing local hooks..."
diff --git a/helpers/lh_binary_local-includes b/helpers/lh_binary_local-includes
index cb61e3ac9..a12a186ff 100755
--- a/helpers/lh_binary_local-includes
+++ b/helpers/lh_binary_local-includes
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
Echo_message "Begin copying binary local includes..."
diff --git a/helpers/lh_binary_local-packageslists b/helpers/lh_binary_local-packageslists
index bccb2ed9c..cc3c87ddc 100755
--- a/helpers/lh_binary_local-packageslists
+++ b/helpers/lh_binary_local-packageslists
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
Echo_message "Begin installing local packages lists..."
diff --git a/helpers/lh_binary_manifest b/helpers/lh_binary_manifest
index f6eef0f09..8251de7d6 100755
--- a/helpers/lh_binary_manifest
+++ b/helpers/lh_binary_manifest
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
Echo_message "Begin creating manifest..."
diff --git a/helpers/lh_binary_md5sum b/helpers/lh_binary_md5sum
index 1e1a54816..40540f223 100755
--- a/helpers/lh_binary_md5sum
+++ b/helpers/lh_binary_md5sum
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
if [ "${LH_CHECKSUMS}" != "enabled" ]
diff --git a/helpers/lh_binary_memtest b/helpers/lh_binary_memtest
index 2a41b03df..083e47763 100755
--- a/helpers/lh_binary_memtest
+++ b/helpers/lh_binary_memtest
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
if [ "${LH_MEMTEST}" = "disabled" ] || [ "${LH_MEMTEST}" = "none" ]
diff --git a/helpers/lh_binary_net b/helpers/lh_binary_net
index 92405760a..f97d4c3b3 100755
--- a/helpers/lh_binary_net
+++ b/helpers/lh_binary_net
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
if ! echo "${LH_BINARY_IMAGES}" | grep -qs net
diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs
index 5dce2f198..de634bebc 100755
--- a/helpers/lh_binary_rootfs
+++ b/helpers/lh_binary_rootfs
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
Echo_message "Begin building root filesystem image..."
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 846923770..8b8fc3fe0 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
if [ "${LH_BOOTLOADER}" != "syslinux" ]
diff --git a/helpers/lh_binary_tar b/helpers/lh_binary_tar
index 6661f60ee..85ff064ab 100755
--- a/helpers/lh_binary_tar
+++ b/helpers/lh_binary_tar
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
if ! echo "${LH_BINARY_IMAGES}" | grep -qs tar
diff --git a/helpers/lh_binary_usb-hdd b/helpers/lh_binary_usb-hdd
index 7dfddc8b1..fb4a9f335 100755
--- a/helpers/lh_binary_usb-hdd
+++ b/helpers/lh_binary_usb-hdd
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
if ! echo "${LH_BINARY_IMAGES}" | grep -qs usb-hdd
diff --git a/helpers/lh_binary_yaboot b/helpers/lh_binary_yaboot
index c8ec43a8e..7060f8884 100755
--- a/helpers/lh_binary_yaboot
+++ b/helpers/lh_binary_yaboot
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
if [ "${LH_BOOTLOADER}" != "yaboot" ]
diff --git a/helpers/lh_bootstrap b/helpers/lh_bootstrap
index cf9c5e51a..f0277d828 100755
--- a/helpers/lh_bootstrap
+++ b/helpers/lh_bootstrap
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
# Bootstrapping system
diff --git a/helpers/lh_bootstrap_cache b/helpers/lh_bootstrap_cache
index d7fadc478..81110e329 100755
--- a/helpers/lh_bootstrap_cache
+++ b/helpers/lh_bootstrap_cache
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
# Check architecture
diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/lh_bootstrap_cdebootstrap
index 9ab3e17a8..0297dfc18 100755
--- a/helpers/lh_bootstrap_cdebootstrap
+++ b/helpers/lh_bootstrap_cdebootstrap
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
if [ "${LH_BOOTSTRAP}" != "cdebootstrap" ]
diff --git a/helpers/lh_bootstrap_copy b/helpers/lh_bootstrap_copy
index 628a9b085..4c65b39e5 100755
--- a/helpers/lh_bootstrap_copy
+++ b/helpers/lh_bootstrap_copy
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
if [ "${LH_BOOTSTRAP}" != "copy" ]
diff --git a/helpers/lh_bootstrap_debootstrap b/helpers/lh_bootstrap_debootstrap
index 4c3c04237..42455812d 100755
--- a/helpers/lh_bootstrap_debootstrap
+++ b/helpers/lh_bootstrap_debootstrap
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
if [ "${LH_BOOTSTRAP}" != "debootstrap" ]
diff --git a/helpers/lh_chroot b/helpers/lh_chroot
index 6e9a27c15..16946c759 100755
--- a/helpers/lh_chroot
+++ b/helpers/lh_chroot
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
# Configuring chroot
diff --git a/helpers/lh_chroot_apt b/helpers/lh_chroot_apt
index 7a0b5b4c2..055814684 100755
--- a/helpers/lh_chroot_apt
+++ b/helpers/lh_chroot_apt
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
# Requiring stage file
diff --git a/helpers/lh_chroot_cache b/helpers/lh_chroot_cache
index e0e01dfa9..1729396f8 100755
--- a/helpers/lh_chroot_cache
+++ b/helpers/lh_chroot_cache
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
Echo_message "Begin caching chroot stage..."
diff --git a/helpers/lh_chroot_debianchroot b/helpers/lh_chroot_debianchroot
index 1e7cad7b8..29a28dbde 100755
--- a/helpers/lh_chroot_debianchroot
+++ b/helpers/lh_chroot_debianchroot
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
# Requiring stage file
diff --git a/helpers/lh_chroot_devpts b/helpers/lh_chroot_devpts
index 67041c6a5..0cdb280c8 100755
--- a/helpers/lh_chroot_devpts
+++ b/helpers/lh_chroot_devpts
@@ -28,13 +28,7 @@ Arguments "${@}"
lh_testroot
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
# Requiring stage file
diff --git a/helpers/lh_chroot_dpkg b/helpers/lh_chroot_dpkg
index 9b350ca09..4a13b8d2c 100755
--- a/helpers/lh_chroot_dpkg
+++ b/helpers/lh_chroot_dpkg
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
# Requiring stage file
diff --git a/helpers/lh_chroot_hacks b/helpers/lh_chroot_hacks
index f29d61d27..df891042d 100755
--- a/helpers/lh_chroot_hacks
+++ b/helpers/lh_chroot_hacks
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
Echo_message "Begin executing hacks..."
diff --git a/helpers/lh_chroot_hooks b/helpers/lh_chroot_hooks
index f69ee36d1..4e82a9f36 100755
--- a/helpers/lh_chroot_hooks
+++ b/helpers/lh_chroot_hooks
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
Echo_message "Begin executing hooks..."
diff --git a/helpers/lh_chroot_hostname b/helpers/lh_chroot_hostname
index 813cfeec4..5d4355422 100755
--- a/helpers/lh_chroot_hostname
+++ b/helpers/lh_chroot_hostname
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
# Requiring stage file
diff --git a/helpers/lh_chroot_hosts b/helpers/lh_chroot_hosts
index ed0c25873..3f9ca83f6 100755
--- a/helpers/lh_chroot_hosts
+++ b/helpers/lh_chroot_hosts
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
# Requiring stage file
diff --git a/helpers/lh_chroot_interactive b/helpers/lh_chroot_interactive
index f66f302f8..cb821ceb3 100755
--- a/helpers/lh_chroot_interactive
+++ b/helpers/lh_chroot_interactive
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
if [ "${LH_INTERACTIVE}" = "disabled" ]
diff --git a/helpers/lh_chroot_linux-image b/helpers/lh_chroot_linux-image
index 16ed284a8..4a2e0e99c 100755
--- a/helpers/lh_chroot_linux-image
+++ b/helpers/lh_chroot_linux-image
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
# Requiring stage file
diff --git a/helpers/lh_chroot_local-hooks b/helpers/lh_chroot_local-hooks
index 4a98ed7a8..b0f9e50ff 100755
--- a/helpers/lh_chroot_local-hooks
+++ b/helpers/lh_chroot_local-hooks
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
Echo_message "Begin executing local hooks..."
diff --git a/helpers/lh_chroot_local-includes b/helpers/lh_chroot_local-includes
index 7135cd0b1..281080d5e 100755
--- a/helpers/lh_chroot_local-includes
+++ b/helpers/lh_chroot_local-includes
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
Echo_message "Begin copying chroot local includes..."
diff --git a/helpers/lh_chroot_local-packages b/helpers/lh_chroot_local-packages
index 36c126a84..484168c4f 100755
--- a/helpers/lh_chroot_local-packages
+++ b/helpers/lh_chroot_local-packages
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
Echo_message "Begin installing local packages..."
diff --git a/helpers/lh_chroot_local-packageslists b/helpers/lh_chroot_local-packageslists
index f140aa5af..ac21f09cc 100755
--- a/helpers/lh_chroot_local-packageslists
+++ b/helpers/lh_chroot_local-packageslists
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
Echo_message "Begin installing local packages lists..."
diff --git a/helpers/lh_chroot_local-preseed b/helpers/lh_chroot_local-preseed
index e6084a3f5..367bd5713 100755
--- a/helpers/lh_chroot_local-preseed
+++ b/helpers/lh_chroot_local-preseed
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
Echo_message "Begin executing locale preseed..."
diff --git a/helpers/lh_chroot_localization b/helpers/lh_chroot_localization
index 00b96b267..941a5af3d 100755
--- a/helpers/lh_chroot_localization
+++ b/helpers/lh_chroot_localization
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
Echo_message "Begin installing localization packages..."
diff --git a/helpers/lh_chroot_packages b/helpers/lh_chroot_packages
index 98d03bab0..1fc69a9f6 100755
--- a/helpers/lh_chroot_packages
+++ b/helpers/lh_chroot_packages
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
Echo_message "Begin installing packages..."
diff --git a/helpers/lh_chroot_packageslists b/helpers/lh_chroot_packageslists
index 725b89708..21b5107e9 100755
--- a/helpers/lh_chroot_packageslists
+++ b/helpers/lh_chroot_packageslists
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
Echo_message "Begin installing packages lists..."
diff --git a/helpers/lh_chroot_preseed b/helpers/lh_chroot_preseed
index 5519cc3ca..89da6b896 100755
--- a/helpers/lh_chroot_preseed
+++ b/helpers/lh_chroot_preseed
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
Echo_message "Begin executing preseed..."
diff --git a/helpers/lh_chroot_proc b/helpers/lh_chroot_proc
index 90e33a3ae..0cb52058c 100755
--- a/helpers/lh_chroot_proc
+++ b/helpers/lh_chroot_proc
@@ -28,13 +28,7 @@ Arguments "${@}"
lh_testroot
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
# Requiring stage file
diff --git a/helpers/lh_chroot_resolv b/helpers/lh_chroot_resolv
index 08e7d95f1..51cf7346c 100755
--- a/helpers/lh_chroot_resolv
+++ b/helpers/lh_chroot_resolv
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
# Requiring stage file
diff --git a/helpers/lh_chroot_sources b/helpers/lh_chroot_sources
index 633df5c39..cf086cf39 100755
--- a/helpers/lh_chroot_sources
+++ b/helpers/lh_chroot_sources
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
# Requiring stage file
diff --git a/helpers/lh_chroot_symlinks b/helpers/lh_chroot_symlinks
index 7c86f8165..ae6fd27be 100755
--- a/helpers/lh_chroot_symlinks
+++ b/helpers/lh_chroot_symlinks
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
if [ "${LH_SYMLINKS}" != "enabled" ]
diff --git a/helpers/lh_chroot_sysfs b/helpers/lh_chroot_sysfs
index 08e64a204..d78dd50e7 100755
--- a/helpers/lh_chroot_sysfs
+++ b/helpers/lh_chroot_sysfs
@@ -28,13 +28,7 @@ Arguments "${@}"
lh_testroot
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
# Requiring stage file
diff --git a/helpers/lh_chroot_sysv-rc b/helpers/lh_chroot_sysv-rc
index 06629fa96..abad21e96 100755
--- a/helpers/lh_chroot_sysv-rc
+++ b/helpers/lh_chroot_sysv-rc
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
# Requiring stage file
diff --git a/helpers/lh_chroot_sysvinit b/helpers/lh_chroot_sysvinit
index 165539c18..fbb35be69 100755
--- a/helpers/lh_chroot_sysvinit
+++ b/helpers/lh_chroot_sysvinit
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
Echo_message "Configuring package sysvinit"
diff --git a/helpers/lh_chroot_tasks b/helpers/lh_chroot_tasks
index 5a82bee69..b55478305 100755
--- a/helpers/lh_chroot_tasks
+++ b/helpers/lh_chroot_tasks
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
Echo_message "Begin installing tasks..."
diff --git a/helpers/lh_clean b/helpers/lh_clean
index 6eeb1d438..4d20016ef 100755
--- a/helpers/lh_clean
+++ b/helpers/lh_clean
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--all] [--cache] [--chroot] [--binary] [--purge] [--remove] [
#Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
# Avoid cases were users accidentally nuke their config/binary
diff --git a/helpers/lh_config b/helpers/lh_config
index 306cd64e9..58680797d 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -652,13 +652,7 @@ Local_arguments ()
}
# Reading existing configuration
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Local_arguments "${@}"
diff --git a/helpers/lh_source b/helpers/lh_source
index aca176dd4..5b668a0d4 100755
--- a/helpers/lh_source
+++ b/helpers/lh_source
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
# Enabling network in chroot
diff --git a/helpers/lh_source_debian b/helpers/lh_source_debian
index 959ec6d5c..fa7b1091a 100755
--- a/helpers/lh_source_debian
+++ b/helpers/lh_source_debian
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
if [ "${LH_SOURCE}" != "enabled" ]
diff --git a/helpers/lh_source_debian-live b/helpers/lh_source_debian-live
index 8a48d0135..151146813 100755
--- a/helpers/lh_source_debian-live
+++ b/helpers/lh_source_debian-live
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
if [ "${LH_SOURCE}" != "enabled" ]
diff --git a/helpers/lh_source_disk b/helpers/lh_source_disk
index 6ce1e5da1..e61cb4fd8 100755
--- a/helpers/lh_source_disk
+++ b/helpers/lh_source_disk
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
if [ "${LH_SOURCE_IMAGES}" != "iso" ]
diff --git a/helpers/lh_source_iso b/helpers/lh_source_iso
index dbad636d3..0cb0243f1 100755
--- a/helpers/lh_source_iso
+++ b/helpers/lh_source_iso
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
if [ "${LH_SOURCE}" != "enabled" ]
diff --git a/helpers/lh_source_md5sum b/helpers/lh_source_md5sum
index 965307e30..af3a92e9d 100755
--- a/helpers/lh_source_md5sum
+++ b/helpers/lh_source_md5sum
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
if [ "${LH_SOURCE}" != "enabled" ]
diff --git a/helpers/lh_source_net b/helpers/lh_source_net
index 554ad8e20..192ea3b13 100755
--- a/helpers/lh_source_net
+++ b/helpers/lh_source_net
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
if [ "${LH_SOURCE}" != "enabled" ]
diff --git a/helpers/lh_source_tar b/helpers/lh_source_tar
index 1334fa859..ecd04ee97 100755
--- a/helpers/lh_source_tar
+++ b/helpers/lh_source_tar
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
if [ "${LH_SOURCE}" != "enabled" ]
diff --git a/helpers/lh_source_usb-hdd b/helpers/lh_source_usb-hdd
index b43ff2f0e..3913f9b78 100755
--- a/helpers/lh_source_usb-hdd
+++ b/helpers/lh_source_usb-hdd
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
if [ "${LH_SOURCE}" != "enabled" ]
diff --git a/helpers/lh_testroot b/helpers/lh_testroot
index e2f3b8a2c..24ed308dc 100755
--- a/helpers/lh_testroot
+++ b/helpers/lh_testroot
@@ -25,13 +25,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffile config/all
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Read_conffile "${LH_CONFIG}"
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
# Checking user account