Using new Read_conffile(); now.

67 files changed, 67 insertions, 469 deletions

diff --git a/helpers/lh_binary b/helpers/lh_binary
index 2cc5ce0..e8ca415 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 32b4aab..e78c725 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 04f9435..8a19f1c 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 ab0b2dc..04db1ac 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 62a6c0a..22db1df 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 974fc03..2cedaa4 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 24c9e5d..ba628ef 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 9bc844b..aa2e6db 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 308d8ae..0419090 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 d164415..455e86b 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 cb61e3a..a12a186 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 bccb2ed..cc3c87d 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 f6eef0f..8251de7 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 1e1a548..40540f2 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 2a41b03..083e477 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 9240576..f97d4c3 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 5dce2f1..de634be 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 8469237..8b8fc3f 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 6661f60..85ff064 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 7dfddc8..fb4a9f3 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 c8ec43a..7060f88 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 cf9c5e5..f0277d8 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 d7fadc4..81110e3 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 9ab3e17..0297dfc 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 628a9b0..4c65b39 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 4c3c042..4245581 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 6e9a27c..16946c7 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 7a0b5b4..0558146 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 e0e01df..1729396 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 1e7cad7..29a28db 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 67041c6..0cdb280 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 9b350ca..4a13b8d 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 f29d61d..df89104 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 f69ee36..4e82a9f 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 813cfee..5d43554 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 ed0c258..3f9ca83 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 f66f302..cb821ce 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 16ed284..4a2e0e9 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 4a98ed7..b0f9e50 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 7135cd0..281080d 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 36c126a..484168c 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 f140aa5..ac21f09 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 e6084a3..367bd57 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 00b96b2..941a5af 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 98d03ba..1fc69a9 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 725b897..21b5107 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 5519cc3..89da6b8 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 90e33a3..0cb5205 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 08e7d95..51cf734 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 633df5c..cf086cf 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 7c86f81..ae6fd27 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 08e64a2..d78dd50 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 06629fa..abad21e 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 165539c..fbb35be 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 5a82bee..b554783 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 6eeb1d4..4d20016 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 306cd64..5868079 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 aca176d..5b668a0 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 959ec6d..fa7b109 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 8a48d01..1511468 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 6ce1e5d..e61cb4f 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 dbad636..0cb0243 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 965307e..af3a92e 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 554ad8e..192ea3b 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 1334fa8..ecd04ee 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 b43ff2f..3913f9b 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 e2f3b8a..24ed308 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