diff options
72 files changed, 74 insertions, 74 deletions
diff --git a/functions/conffile.sh b/functions/conffile.sh index 1679e9d..32b1148 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 701db6d..fb2ed6b 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 1300f92..77ddf4e 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 9b9a5b9..b635702 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 988fe73..77b1ede 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 cf89574..b45b0b4 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 0648552..ca01201 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 10f154d..4a2f44f 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 82f4bf5..8866197 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 a241e59..7fe2986 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 96ed5ea..8351255 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 d28918c..61f988f 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 28423a9..7e76801 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 c731c06..7b6481e 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 4160107..2921e91 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 45e3091..6a67a67 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 88d530c..360693f 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 07159e7..4d61af4 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 7a64f97..d589c08 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 529b392..cadb1f4 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 74ea19d..2b2f7d2 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 cc8d751..db3806d 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 e4a442b..a0ca748 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 0713904..49edadc 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 81110e3..8001b4c 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 61683dd..66e419f 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 550991b..5e0c01f 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 194a545..ae33f5e 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 bb07c83..b57787c 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 abe3d99..023eae1 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 adc6c20..b82e3ee 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 1729396..a942a0f 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 1baeb81..7cbdec6 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 993019f..f4208fe 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 6c2b86e..f232ac8 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 f366d8c..f6d0726 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 800e5d4..5922ef3 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 cea01b0..f50a01c 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 a5ba430..7858273 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 d68ce10..ddd5f73 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 b8ebb9d..b7d34d6 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 849a4ab..b34a76a 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 09361da..33718b0 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 20d19c9..cdcc5f6 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 4ede713..46592cd 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 3d24437..e65562e 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 807bae9..afdcb47 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 f9758f3..29e571c 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 132d8c4..f002906 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 5a1558c..1158641 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 51be962..ce9235e 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 b0b0627..00e4474 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 f678a9a..bad2357 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 c44aea0..976581f 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 48da344..30b117c 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 4763031..aaf1f72 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 05c3b8d..1898299 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 b82f087..f0bbf40 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 6f69169..b0031ff 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 d3abdf4..9662477 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 23c4967..6e02f63 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 9b38c8a..513a2dc 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 1982e4a..8c255b6 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 5e391dd..43e49e9 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 8af129f..7ee2778 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 f71e34d..d6907de 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 688b27a..6c3fc1e 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 59ab28a..913b2bc 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 9a4b478..2cc9b51 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 85ba9ab..fed1ed0 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 b6e70fa..c15d225 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 24ed308..d7510d3 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 |