Renaming internal Read_conffile(); to Read_conffiles(); for consistency reasons.

72 files changed, 74 insertions, 74 deletions

diff --git a/functions/conffile.sh b/functions/conffile.sh
index 1679e9d37..32b1148dc 100755
--- a/functions/conffile.sh
+++ b/functions/conffile.sh
@@ -27,7 +27,7 @@ Get_conffiles ()
 	echo ${FILES}
 }
 
-Read_conffile ()
+Read_conffiles ()
 {
 	for CONFFILE in Get_conffiles "${@}"
 	do
diff --git a/helpers/lh_binary b/helpers/lh_binary
index 701db6df4..fb2ed6bd2 100755
--- a/helpers/lh_binary
+++ b/helpers/lh_binary
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
 # Setup cleanup function
diff --git a/helpers/lh_binary_chroot b/helpers/lh_binary_chroot
index 1300f92f2..77ddf4e77 100755
--- a/helpers/lh_binary_chroot
+++ b/helpers/lh_binary_chroot
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 9b9a5b990..b6357027d 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
 if [ "${LH_DEBUG}" = "enabled" ]
diff --git a/helpers/lh_binary_disk b/helpers/lh_binary_disk
index 988fe7352..77b1edee5 100755
--- a/helpers/lh_binary_disk
+++ b/helpers/lh_binary_disk
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
 case "${LH_BINARY_IMAGES}" in
diff --git a/helpers/lh_binary_encryption b/helpers/lh_binary_encryption
index cf8957415..b45b0b489 100755
--- a/helpers/lh_binary_encryption
+++ b/helpers/lh_binary_encryption
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 064855249..ca012019d 100755
--- a/helpers/lh_binary_grub
+++ b/helpers/lh_binary_grub
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 10f154d5f..4a2f44f22 100755
--- a/helpers/lh_binary_includes
+++ b/helpers/lh_binary_includes
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 82f4bf576..8866197b6 100755
--- a/helpers/lh_binary_iso
+++ b/helpers/lh_binary_iso
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
 if ! In_list iso "${LH_BINARY_IMAGES}"
diff --git a/helpers/lh_binary_linux-image b/helpers/lh_binary_linux-image
index a241e5920..7fe298640 100755
--- a/helpers/lh_binary_linux-image
+++ b/helpers/lh_binary_linux-image
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 96ed5eaa3..835125506 100755
--- a/helpers/lh_binary_local-hooks
+++ b/helpers/lh_binary_local-hooks
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 d28918c3c..61f988f5b 100755
--- a/helpers/lh_binary_local-includes
+++ b/helpers/lh_binary_local-includes
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 28423a9b7..7e768013b 100755
--- a/helpers/lh_binary_local-packageslists
+++ b/helpers/lh_binary_local-packageslists
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 c731c06d0..7b6481ea1 100755
--- a/helpers/lh_binary_manifest
+++ b/helpers/lh_binary_manifest
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 416010795..2921e915d 100755
--- a/helpers/lh_binary_md5sum
+++ b/helpers/lh_binary_md5sum
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 45e309180..6a67a67a4 100755
--- a/helpers/lh_binary_memtest
+++ b/helpers/lh_binary_memtest
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 88d530c2d..360693f04 100755
--- a/helpers/lh_binary_net
+++ b/helpers/lh_binary_net
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
 if ! In_list net "${LH_BINARY_IMAGES}"
diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs
index 07159e718..4d61af400 100755
--- a/helpers/lh_binary_rootfs
+++ b/helpers/lh_binary_rootfs
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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_silo b/helpers/lh_binary_silo
index 7a64f971e..d589c086c 100755
--- a/helpers/lh_binary_silo
+++ b/helpers/lh_binary_silo
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
 if [ "${LH_BOOTLOADER}" != "silo" ]
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 529b39253..cadb1f489 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 74ea19d67..2b2f7d2e6 100755
--- a/helpers/lh_binary_tar
+++ b/helpers/lh_binary_tar
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
 if ! In_list tar "${LH_BINARY_IMAGES}"
diff --git a/helpers/lh_binary_usb-hdd b/helpers/lh_binary_usb-hdd
index cc8d7514d..db3806d45 100755
--- a/helpers/lh_binary_usb-hdd
+++ b/helpers/lh_binary_usb-hdd
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
 if ! In_list usb-hdd "${LH_BINARY_IMAGES}"
diff --git a/helpers/lh_binary_yaboot b/helpers/lh_binary_yaboot
index e4a442bc4..a0ca74800 100755
--- a/helpers/lh_binary_yaboot
+++ b/helpers/lh_binary_yaboot
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 0713904c2..49edadc1f 100755
--- a/helpers/lh_bootstrap
+++ b/helpers/lh_bootstrap
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
 # Setup cleanup function
diff --git a/helpers/lh_bootstrap_cache b/helpers/lh_bootstrap_cache
index 81110e329..8001b4ce1 100755
--- a/helpers/lh_bootstrap_cache
+++ b/helpers/lh_bootstrap_cache
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 61683dde0..66e419f6d 100755
--- a/helpers/lh_bootstrap_cdebootstrap
+++ b/helpers/lh_bootstrap_cdebootstrap
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 550991b25..5e0c01ffe 100755
--- a/helpers/lh_bootstrap_copy
+++ b/helpers/lh_bootstrap_copy
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 194a545d4..ae33f5e7c 100755
--- a/helpers/lh_bootstrap_debootstrap
+++ b/helpers/lh_bootstrap_debootstrap
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
 if [ "${LH_BOOTSTRAP}" != "debootstrap" ]
diff --git a/helpers/lh_build b/helpers/lh_build
index bb07c835a..b57787cc1 100755
--- a/helpers/lh_build
+++ b/helpers/lh_build
@@ -42,7 +42,7 @@ then
 fi
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
 # Checking defaults
diff --git a/helpers/lh_chroot b/helpers/lh_chroot
index abe3d9924..023eae1c1 100755
--- a/helpers/lh_chroot
+++ b/helpers/lh_chroot
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
 # Setup cleanup function
diff --git a/helpers/lh_chroot_apt b/helpers/lh_chroot_apt
index adc6c2025..b82e3ee89 100755
--- a/helpers/lh_chroot_apt
+++ b/helpers/lh_chroot_apt
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} {install|install-binary|remove} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 1729396f8..a942a0fd6 100755
--- a/helpers/lh_chroot_cache
+++ b/helpers/lh_chroot_cache
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 1baeb812e..7cbdec60b 100755
--- a/helpers/lh_chroot_debianchroot
+++ b/helpers/lh_chroot_debianchroot
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 993019f4a..f4208fe61 100755
--- a/helpers/lh_chroot_devpts
+++ b/helpers/lh_chroot_devpts
@@ -28,7 +28,7 @@ Arguments "${@}"
 lh_testroot
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 6c2b86e90..f232ac8c5 100755
--- a/helpers/lh_chroot_dpkg
+++ b/helpers/lh_chroot_dpkg
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 f366d8cf0..f6d07261d 100755
--- a/helpers/lh_chroot_hacks
+++ b/helpers/lh_chroot_hacks
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 800e5d446..5922ef355 100755
--- a/helpers/lh_chroot_hooks
+++ b/helpers/lh_chroot_hooks
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 cea01b079..f50a01c41 100755
--- a/helpers/lh_chroot_hostname
+++ b/helpers/lh_chroot_hostname
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 a5ba430a0..7858273d0 100755
--- a/helpers/lh_chroot_hosts
+++ b/helpers/lh_chroot_hosts
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
 # Requiring stage file
diff --git a/helpers/lh_chroot_install-packages b/helpers/lh_chroot_install-packages
index d68ce10d1..ddd5f739b 100755
--- a/helpers/lh_chroot_install-packages
+++ b/helpers/lh_chroot_install-packages
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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_interactive b/helpers/lh_chroot_interactive
index b8ebb9daf..b7d34d690 100755
--- a/helpers/lh_chroot_interactive
+++ b/helpers/lh_chroot_interactive
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 849a4ab2a..b34a76a62 100755
--- a/helpers/lh_chroot_linux-image
+++ b/helpers/lh_chroot_linux-image
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 09361da87..33718b082 100755
--- a/helpers/lh_chroot_local-hooks
+++ b/helpers/lh_chroot_local-hooks
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 20d19c933..cdcc5f67e 100755
--- a/helpers/lh_chroot_local-includes
+++ b/helpers/lh_chroot_local-includes
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 4ede71365..46592cd4f 100755
--- a/helpers/lh_chroot_local-packages
+++ b/helpers/lh_chroot_local-packages
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
 Echo_message "Begin queueing installation of local packages..."
diff --git a/helpers/lh_chroot_local-patches b/helpers/lh_chroot_local-patches
index 3d244370c..e65562ef4 100755
--- a/helpers/lh_chroot_local-patches
+++ b/helpers/lh_chroot_local-patches
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
 Echo_message "Begin applying chroot local patches..."
diff --git a/helpers/lh_chroot_local-preseed b/helpers/lh_chroot_local-preseed
index 807bae90b..afdcb4786 100755
--- a/helpers/lh_chroot_local-preseed
+++ b/helpers/lh_chroot_local-preseed
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
 Echo_message "Begin executing local preseeds..."
diff --git a/helpers/lh_chroot_localization b/helpers/lh_chroot_localization
index f9758f39f..29e571cbe 100755
--- a/helpers/lh_chroot_localization
+++ b/helpers/lh_chroot_localization
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 132d8c4dc..f0029061b 100755
--- a/helpers/lh_chroot_packages
+++ b/helpers/lh_chroot_packages
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
 Echo_message "Begin queueing installation of packages..."
diff --git a/helpers/lh_chroot_packageslists b/helpers/lh_chroot_packageslists
index 5a1558c92..1158641e4 100755
--- a/helpers/lh_chroot_packageslists
+++ b/helpers/lh_chroot_packageslists
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
 Echo_message "Begin queueing installation of packages lists..."
diff --git a/helpers/lh_chroot_preseed b/helpers/lh_chroot_preseed
index 51be962aa..ce9235e62 100755
--- a/helpers/lh_chroot_preseed
+++ b/helpers/lh_chroot_preseed
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 b0b062727..00e447415 100755
--- a/helpers/lh_chroot_proc
+++ b/helpers/lh_chroot_proc
@@ -28,7 +28,7 @@ Arguments "${@}"
 lh_testroot
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 f678a9a83..bad23577f 100755
--- a/helpers/lh_chroot_resolv
+++ b/helpers/lh_chroot_resolv
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
 # Requiring stage file
diff --git a/helpers/lh_chroot_selinuxfs b/helpers/lh_chroot_selinuxfs
index c44aea07e..976581ff6 100755
--- a/helpers/lh_chroot_selinuxfs
+++ b/helpers/lh_chroot_selinuxfs
@@ -28,7 +28,7 @@ Arguments "${@}"
 lh_testroot
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 48da34483..30b117cb0 100755
--- a/helpers/lh_chroot_sources
+++ b/helpers/lh_chroot_sources
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 4763031e5..aaf1f72e7 100755
--- a/helpers/lh_chroot_symlinks
+++ b/helpers/lh_chroot_symlinks
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 05c3b8d3a..18982992f 100755
--- a/helpers/lh_chroot_sysfs
+++ b/helpers/lh_chroot_sysfs
@@ -28,7 +28,7 @@ Arguments "${@}"
 lh_testroot
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 b82f0871b..f0bbf4087 100755
--- a/helpers/lh_chroot_sysv-rc
+++ b/helpers/lh_chroot_sysv-rc
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 6f6916914..b0031ffaa 100755
--- a/helpers/lh_chroot_sysvinit
+++ b/helpers/lh_chroot_sysvinit
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 d3abdf4a3..96624773a 100755
--- a/helpers/lh_chroot_tasks
+++ b/helpers/lh_chroot_tasks
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 23c4967cb..6e02f634c 100755
--- a/helpers/lh_clean
+++ b/helpers/lh_clean
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--all] [--cache] [--chroot] [--binary] [--purge] [--remove] [
 #Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 9b38c8abd..513a2dc06 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -728,17 +728,17 @@ Local_arguments ()
 if [ -f "${SYSTEM_LH_CONFFILE}" ] && ! In_list "--ignore-system-defaults" "${@}"
 then
 	Echo_message "Considering defaults defined in %s" "${SYSTEM_LH_CONFFILE}"
-	Read_conffile "${SYSTEM_LH_CONFFILE}"
+	Read_conffiles "${SYSTEM_LH_CONFFILE}"
 fi
 
 # Reading existing configuration
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 
 Local_arguments "${@}"
 
 if [ -n "${LH_CONFFILE}" ]
 then
-	Read_conffile "${LH_CONFFILE}"
+	Read_conffiles "${LH_CONFFILE}"
 fi
 
 # Setting defaults
diff --git a/helpers/lh_source b/helpers/lh_source
index 1982e4a15..8c255b601 100755
--- a/helpers/lh_source
+++ b/helpers/lh_source
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
 Require_stagefile .stage/chroot_install-packages
diff --git a/helpers/lh_source_debian b/helpers/lh_source_debian
index 5e391dd3e..43e49e9e5 100755
--- a/helpers/lh_source_debian
+++ b/helpers/lh_source_debian
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 8af129fb9..7ee277820 100755
--- a/helpers/lh_source_debian-live
+++ b/helpers/lh_source_debian-live
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 f71e34d96..d6907de9b 100755
--- a/helpers/lh_source_disk
+++ b/helpers/lh_source_disk
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 688b27a99..6c3fc1e39 100755
--- a/helpers/lh_source_iso
+++ b/helpers/lh_source_iso
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 59ab28a9b..913b2bc5e 100755
--- a/helpers/lh_source_md5sum
+++ b/helpers/lh_source_md5sum
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 9a4b47866..2cc9b51a9 100755
--- a/helpers/lh_source_net
+++ b/helpers/lh_source_net
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 85ba9abe4..fed1ed0f1 100755
--- a/helpers/lh_source_tar
+++ b/helpers/lh_source_tar
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 b6e70faa9..c15d22591 100755
--- a/helpers/lh_source_usb-hdd
+++ b/helpers/lh_source_usb-hdd
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles 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 24ed308dc..d7510d3f6 100755
--- a/helpers/lh_testroot
+++ b/helpers/lh_testroot
@@ -25,7 +25,7 @@ USAGE="${PROGRAM} [--force]"
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
 # Checking user account