tidy script init (1/4) - arg and config processing

Partial fix for #952919 Gbp-Dch: Short
2015-02-05 03:30:47 +00:00 · 2015-02-05 03:30:47 +00:00 · b49abcc1a8
parent ed2d70bde1
commit b49abcc1a8
68 changed files with 155 additions and 329 deletions
--- a/functions/init.sh
+++ b/functions/init.sh
@ -0,0 +1,22 @@
+#!/bin/sh
+
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2014 Daniel Baumann <mail@daniel-baumann.ch>
+##
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
+
+
+Common_config_files ()
+{
+	echo "config/all config/common config/bootstrap config/chroot config/binary config/source"
+}
+
+Init_config_data ()
+{
+	Arguments "${@}"
+
+	Read_conffiles $(Common_config_files)
+	Set_defaults
+}
--- a/scripts/build/binary
+++ b/scripts/build/binary
@ -25,11 +25,8 @@ DESCRIPTION="Build binary images"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 # Setup cleanup function
 Setup_cleanup
--- a/scripts/build/binary_checksums
+++ b/scripts/build/binary_checksums
@ -18,11 +18,8 @@ DESCRIPTION="Create binary checksums"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 if [ "${LB_CHECKSUMS}" = "none" ]
 then
--- a/scripts/build/binary_chroot
+++ b/scripts/build/binary_chroot
@ -18,11 +18,8 @@ DESCRIPTION="Copy chroot into chroot"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 Echo_message "Begin copying chroot..."

--- a/scripts/build/binary_disk
+++ b/scripts/build/binary_disk
@ -18,11 +18,8 @@ DESCRIPTION="Install disk information into binary"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 case "${LIVE_IMAGE_TYPE}" in
 	iso*|hdd*)
--- a/scripts/build/binary_grub-efi
+++ b/scripts/build/binary_grub-efi
@ -18,11 +18,8 @@ DESCRIPTION="Prepares and installs Grub based EFI support into binary"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 Check_Any_Bootloader_Role "grub-efi"

--- a/scripts/build/binary_grub-legacy
+++ b/scripts/build/binary_grub-legacy
@ -18,11 +18,8 @@ DESCRIPTION="Installs grub-legacy into binary"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 Check_First_Bootloader_Role "grub-legacy"

--- a/scripts/build/binary_grub-pc
+++ b/scripts/build/binary_grub-pc
@ -18,11 +18,8 @@ DESCRIPTION="Installs grub-pc into binary"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 Check_Any_Bootloader_Role "grub-pc"

--- a/scripts/build/binary_hdd
+++ b/scripts/build/binary_hdd
@ -18,11 +18,8 @@ DESCRIPTION="Build binary image"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 if ! In_list hdd "${LIVE_IMAGE_TYPE}"
 then
--- a/scripts/build/binary_hooks
+++ b/scripts/build/binary_hooks
@ -18,11 +18,8 @@ DESCRIPTION="Execute hooks in binary"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 Echo_message "Begin executing hooks..."

--- a/scripts/build/binary_includes
+++ b/scripts/build/binary_includes
@ -18,11 +18,8 @@ DESCRIPTION="Copy files into binary"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 Echo_message "Begin copying binary includes..."

--- a/scripts/build/binary_iso
+++ b/scripts/build/binary_iso
@ -18,11 +18,8 @@ DESCRIPTION="Build iso binary image"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 case "${LIVE_IMAGE_TYPE}" in
 	iso)
--- a/scripts/build/binary_linux-image
+++ b/scripts/build/binary_linux-image
@ -18,11 +18,8 @@ DESCRIPTION="Install linux-image into binary"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 if [ "${LB_LINUX_PACKAGES}" = "none" ]
 then
--- a/scripts/build/binary_loadlin
+++ b/scripts/build/binary_loadlin
@ -18,11 +18,8 @@ DESCRIPTION="Copy loadlin into binary"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 if [ "${LB_LOADLIN}" != "true" ] || [ "${LB_BINARY_IMAGES}" = "netboot" ]
 then
--- a/scripts/build/binary_loopback_cfg
+++ b/scripts/build/binary_loopback_cfg
@ -18,11 +18,8 @@ DESCRIPTION="Installs loopback.cfg into binary"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 # We avoid checking if we need to be running this bootloader
 # on purpose. The reason: You will always want to have
--- a/scripts/build/binary_manifest
+++ b/scripts/build/binary_manifest
@ -18,11 +18,8 @@ DESCRIPTION="Create manifest"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 if [ "${LB_CHROOT_FILESYSTEM}" = "none" ]
 then
--- a/scripts/build/binary_memtest
+++ b/scripts/build/binary_memtest
@ -18,11 +18,8 @@ DESCRIPTION="Installs a memtest into binary"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 if [ "${LB_MEMTEST}" = "none" ] || [ "${LB_CHROOT_FILESYSTEM}" = "none" ]
 then
--- a/scripts/build/binary_netboot
+++ b/scripts/build/binary_netboot
@ -18,11 +18,8 @@ DESCRIPTION="Build netboot binary image"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 if ! In_list netboot "${LIVE_IMAGE_TYPE}"
 then
--- a/scripts/build/binary_onie
+++ b/scripts/build/binary_onie
@ -19,11 +19,8 @@ DESCRIPTION="Build ONIE binary image"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 if [ "${LB_ONIE}" != "true" ]
 then
--- a/scripts/build/binary_package-lists
+++ b/scripts/build/binary_package-lists
@ -18,11 +18,8 @@ DESCRIPTION="Install local packages into binary"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 Echo_message "Begin installing local package lists..."

--- a/scripts/build/binary_rootfs
+++ b/scripts/build/binary_rootfs
@ -18,11 +18,8 @@ DESCRIPTION="Build rootfs image"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 Echo_message "Begin building root filesystem image..."

--- a/scripts/build/binary_syslinux
+++ b/scripts/build/binary_syslinux
@ -18,11 +18,8 @@ DESCRIPTION="Installs syslinux into binary"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 Check_Any_Bootloader_Role "syslinux"

--- a/scripts/build/binary_tar
+++ b/scripts/build/binary_tar
@ -18,11 +18,8 @@ DESCRIPTION="Build binary tarball"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 if ! In_list tar "${LIVE_IMAGE_TYPE}"
 then
--- a/scripts/build/binary_win32-loader
+++ b/scripts/build/binary_win32-loader
@ -18,11 +18,8 @@ DESCRIPTION="Copy win32-loader into binary"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 if [ "${LB_WIN32_LOADER}" != "true" ]
 then
--- a/scripts/build/binary_zsync
+++ b/scripts/build/binary_zsync
@ -18,11 +18,8 @@ DESCRIPTION="Build zsync control files"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 if [ "${LIVE_IMAGE_TYPE}" != "iso" ] && [ "${LIVE_IMAGE_TYPE}" != "iso-hybrid" ]
 then
--- a/scripts/build/bootstrap
+++ b/scripts/build/bootstrap
@ -25,11 +25,8 @@ DESCRIPTION="Bootstrap a Debian system"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 # Setup cleanup function
 Setup_cleanup
--- a/scripts/build/bootstrap_archives
+++ b/scripts/build/bootstrap_archives
@ -25,11 +25,8 @@ if [ "${_PASS}" != "binary" ] && [ "${_PASS}" != "source" ]; then
 	Usage
 fi

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 # Requiring stage file
 Require_stagefile .build/config .build/bootstrap
--- a/scripts/build/bootstrap_cache
+++ b/scripts/build/bootstrap_cache
@ -18,11 +18,8 @@ DESCRIPTION="Cache bootstrap stage"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 # Check architecture
 Check_crossarchitectures
--- a/scripts/build/bootstrap_debootstrap
+++ b/scripts/build/bootstrap_debootstrap
@ -18,11 +18,8 @@ DESCRIPTION="Bootstrap a Debian system with debootstrap(8)"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 if [ ! $(which debootstrap) ]
 then
--- a/scripts/build/build
+++ b/scripts/build/build
@ -38,8 +38,6 @@ DESCRIPTION="Build a Debian Live system"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
 if [ ! -d config ]
 then
 	Echo_warning "No config/ directory; using defaults for all options"
@ -58,9 +56,8 @@ then
 	exit 1
 fi

-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 # Checking defaults
 Check_defaults
--- a/scripts/build/chroot
+++ b/scripts/build/chroot
@ -25,11 +25,8 @@ DESCRIPTION="Customize the Debian system"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 # Setup cleanup function
 Setup_cleanup
--- a/scripts/build/chroot_apt
+++ b/scripts/build/chroot_apt
@ -18,11 +18,8 @@ DESCRIPTION="Manage /etc/apt/apt.conf"
 HELP=""
 USAGE="${PROGRAM} {install|install-binary|remove} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 # Requiring stage file
 Require_stagefile .build/config .build/bootstrap
--- a/scripts/build/chroot_archives
+++ b/scripts/build/chroot_archives
@ -26,11 +26,8 @@ then
 	Usage
 fi

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 # Requiring stage file
 Require_stagefile .build/config .build/bootstrap
--- a/scripts/build/chroot_cache
+++ b/scripts/build/chroot_cache
@ -18,11 +18,8 @@ DESCRIPTION="Cache chroot stage"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 if ! In_list "chroot" ${LB_CACHE_STAGES}
 then
--- a/scripts/build/chroot_debianchroot
+++ b/scripts/build/chroot_debianchroot
@ -18,11 +18,8 @@ DESCRIPTION="Manage /etc/debian_chroot"
 HELP=""
 USAGE="${PROGRAM} {install|remove} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 # Requiring stage file
 Require_stagefile .build/config .build/bootstrap
--- a/scripts/build/chroot_devpts
+++ b/scripts/build/chroot_devpts
@ -18,11 +18,8 @@ DESCRIPTION="Mount /dev/pts"
 HELP=""
 USAGE="${PROGRAM} {install|remove} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 # Requiring stage file
 Require_stagefile .build/config .build/bootstrap
--- a/scripts/build/chroot_dpkg
+++ b/scripts/build/chroot_dpkg
@ -18,11 +18,8 @@ DESCRIPTION="Manage /sbin/dpkg"
 HELP=""
 USAGE="${PROGRAM} {install|remove} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 # Requiring stage file
 Require_stagefile .build/config .build/bootstrap
--- a/scripts/build/chroot_firmware
+++ b/scripts/build/chroot_firmware
@ -18,11 +18,8 @@ DESCRIPTION="Schedule kernel packages for installation"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 if [ "${LB_FIRMWARE_CHROOT}" != "true" ]
 then
--- a/scripts/build/chroot_hacks
+++ b/scripts/build/chroot_hacks
@ -18,11 +18,8 @@ DESCRIPTION="Execute hacks in chroot"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 Echo_message "Begin executing hacks..."

--- a/scripts/build/chroot_hooks
+++ b/scripts/build/chroot_hooks
@ -18,11 +18,8 @@ DESCRIPTION="Execute hooks in chroot"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 Echo_message "Begin executing hooks..."

--- a/scripts/build/chroot_hostname
+++ b/scripts/build/chroot_hostname
@ -18,11 +18,8 @@ DESCRIPTION="Manage /bin/hostname"
 HELP=""
 USAGE="${PROGRAM} {install|remove} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 # Requiring stage file
 Require_stagefile .build/config .build/bootstrap
--- a/scripts/build/chroot_hosts
+++ b/scripts/build/chroot_hosts
@ -18,11 +18,8 @@ DESCRIPTION="Manage /etc/hosts"
 HELP=""
 USAGE="${PROGRAM} {install|remove} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 # Requiring stage file
 Require_stagefile .build/config .build/bootstrap
--- a/scripts/build/chroot_includes
+++ b/scripts/build/chroot_includes
@ -18,11 +18,8 @@ DESCRIPTION="Copy files into chroot"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 Echo_message "Begin copying chroot includes..."

--- a/scripts/build/chroot_install-packages
+++ b/scripts/build/chroot_install-packages
@ -21,11 +21,8 @@ USAGE="${PROGRAM} {install|live} [--force]"
 _PASS="${1}"
 shift

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 Echo_message "Begin installing packages (${_PASS} pass)..."

--- a/scripts/build/chroot_interactive
+++ b/scripts/build/chroot_interactive
@ -18,11 +18,8 @@ DESCRIPTION="Make build interactive"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 if [ "${LB_INTERACTIVE}" = "false" ]
 then
--- a/scripts/build/chroot_linux-image
+++ b/scripts/build/chroot_linux-image
@ -18,11 +18,8 @@ DESCRIPTION="Schedule kernel packages for installation"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 if [ "${LB_LINUX_PACKAGES}" = "none" ]
 then
--- a/scripts/build/chroot_package-lists
+++ b/scripts/build/chroot_package-lists
@ -21,11 +21,8 @@ USAGE="${PROGRAM} {install|live} [--force]"
 _PASS="${1}"
 shift

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 Echo_message "Begin queueing installation of package lists (${_PASS} pass)..."

--- a/scripts/build/chroot_preseed
+++ b/scripts/build/chroot_preseed
@ -18,11 +18,8 @@ DESCRIPTION="Execute local preseed in chroot"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 Echo_message "Begin executing local preseeds..."

--- a/scripts/build/chroot_proc
+++ b/scripts/build/chroot_proc
@ -18,11 +18,8 @@ DESCRIPTION="Mount /proc"
 HELP=""
 USAGE="${PROGRAM} {install|remove} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 # Requiring stage file
 Require_stagefile .build/config .build/bootstrap
--- a/scripts/build/chroot_resolv
+++ b/scripts/build/chroot_resolv
@ -18,11 +18,8 @@ DESCRIPTION="Manage /etc/resolv.conf"
 HELP=""
 USAGE="${PROGRAM} {install|remove} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 # Requiring stage file
 Require_stagefile .build/config .build/bootstrap
--- a/scripts/build/chroot_selinuxfs
+++ b/scripts/build/chroot_selinuxfs
@ -18,11 +18,8 @@ DESCRIPTION="Mount /sys/fs/selinux"
 HELP=""
 USAGE="${PROGRAM} {install|remove} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 # Requiring stage file
 Require_stagefile .build/config .build/bootstrap
--- a/scripts/build/chroot_sysfs
+++ b/scripts/build/chroot_sysfs
@ -18,11 +18,8 @@ DESCRIPTION="Mount /sys"
 HELP=""
 USAGE="${PROGRAM} {install|remove} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 # Requiring stage file
 Require_stagefile .build/config .build/bootstrap
--- a/scripts/build/chroot_sysv-rc
+++ b/scripts/build/chroot_sysv-rc
@ -18,11 +18,8 @@ DESCRIPTION="Manage /usr/sbin/policy-rc.d"
 HELP=""
 USAGE="${PROGRAM} {install|remove} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 # Requiring stage file
 Require_stagefile .build/config .build/bootstrap
--- a/scripts/build/chroot_tmpfs
+++ b/scripts/build/chroot_tmpfs
@ -18,11 +18,8 @@ DESCRIPTION="Use tmpfs to speedup the build"
 HELP=""
 USAGE="${PROGRAM} {install|remove} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 if [ "${LB_BUILD_WITH_TMPFS}" != "true" ]
 then
--- a/scripts/build/clean
+++ b/scripts/build/clean
@ -34,7 +34,7 @@ USAGE="${PROGRAM} [--all] [--cache] [--chroot] [--binary] [--purge] [--remove] [
 #Arguments "${@}"

 # Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles $(Common_config_files)
 Set_defaults

 # Avoid cases were users accidentally nuke their config/binary
--- a/scripts/build/config
+++ b/scripts/build/config
@ -186,7 +186,7 @@ Local_arguments ()
 				Echo "%s: This is live-build version %s" "${0}" "${VERSION_DPKG:-${VERSION}}"

 				# Dump conffile contents
-				Print_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+				Print_conffiles $(Common_config_files)

 				# Dump contents of directories that contain text files
 				for DIRECTORY in config/package-lists config/apt config/preseed config/rootfs
@ -909,7 +909,7 @@ then
 fi

 # Reading existing configuration
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles $(Common_config_files)

 Local_arguments "${@}"

--- a/scripts/build/installer
+++ b/scripts/build/installer
@ -25,11 +25,8 @@ DESCRIPTION="Preparing installer images"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 # Setup cleanup function
 Setup_cleanup
--- a/scripts/build/installer_debian-installer
+++ b/scripts/build/installer_debian-installer
@ -18,11 +18,8 @@ DESCRIPTION="Install debian-installer into binary"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 if [ "${_DEBUG}" = "true" ]
 then
--- a/scripts/build/installer_preseed
+++ b/scripts/build/installer_preseed
@ -18,12 +18,8 @@ DESCRIPTION="Include local preseed in installer"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
+# Processing arguments and configuration files
+Init_config_data "${@}"

 # Check d-i configuration
 case "${LB_DEBIAN_INSTALLER}" in
--- a/scripts/build/source
+++ b/scripts/build/source
@ -25,11 +25,8 @@ DESCRIPTION="Build source images"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 if [ "${LB_SOURCE}" != "true" ]
 then
--- a/scripts/build/source_checksums
+++ b/scripts/build/source_checksums
@ -18,11 +18,8 @@ DESCRIPTION="Create source checksums"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 if [ "${LB_CHECKSUMS}" = "none" ] || [ "${LB_SOURCE}" != "true" ]
 then
--- a/scripts/build/source_debian
+++ b/scripts/build/source_debian
@ -18,11 +18,8 @@ DESCRIPTION="Debian sources"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 if [ "${LB_SOURCE}" != "true" ]
 then
--- a/scripts/build/source_disk
+++ b/scripts/build/source_disk
@ -18,11 +18,8 @@ DESCRIPTION="Install disk information into source"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 case "${LB_SOURCE_IMAGES}" in
 	iso*|hdd*)
--- a/scripts/build/source_hdd
+++ b/scripts/build/source_hdd
@ -18,11 +18,8 @@ DESCRIPTION="Build source image"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 if [ "${LB_SOURCE}" != "true" ]
 then
--- a/scripts/build/source_hooks
+++ b/scripts/build/source_hooks
@ -18,11 +18,8 @@ DESCRIPTION="Execute hooks in source"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/source config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 Echo_message "Begin executing hooks..."

--- a/scripts/build/source_iso
+++ b/scripts/build/source_iso
@ -18,11 +18,8 @@ DESCRIPTION="Build iso source image"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 if [ "${LB_SOURCE}" != "true" ]
 then
--- a/scripts/build/source_live
+++ b/scripts/build/source_live
@ -18,11 +18,8 @@ DESCRIPTION="Copy live config into source"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 if [ "${LB_SOURCE}" != "true" ]
 then
--- a/scripts/build/source_tar
+++ b/scripts/build/source_tar
@ -18,11 +18,8 @@ DESCRIPTION="Build source tarball"
 HELP=""
 USAGE="${PROGRAM} [--force]"

-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
+# Processing arguments and configuration files
+Init_config_data "${@}"

 if [ "${LB_SOURCE}" != "true" ]
 then