summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2016-07-29 13:58:09 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2016-11-15 06:12:49 +0000
commit51d2ec5cecd7010c63ce64aab9e6b14f2d854e52 (patch)
tree08535ce0d15137e80a9d3d4ef6f1f0bbaf9c2cec
parentRenaming system-build config tarball to config.tar. (diff)
downloadsystem-build-51d2ec5cecd7010c63ce64aab9e6b14f2d854e52.tar.xz
system-build-51d2ec5cecd7010c63ce64aab9e6b14f2d854e52.zip
Renaming config/chroot to config/system.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
-rwxr-xr-xexamples/auto/clean2
-rw-r--r--examples/gitignore2
-rwxr-xr-xfunctions/defaults.sh2
-rwxr-xr-xscripts/build/binary2
-rwxr-xr-xscripts/build/binary_checksums2
-rwxr-xr-xscripts/build/binary_chroot2
-rwxr-xr-xscripts/build/binary_disk2
-rwxr-xr-xscripts/build/binary_grub-legacy2
-rwxr-xr-xscripts/build/binary_grub-pc2
-rwxr-xr-xscripts/build/binary_hdd2
-rwxr-xr-xscripts/build/binary_hooks2
-rwxr-xr-xscripts/build/binary_includes2
-rwxr-xr-xscripts/build/binary_iso2
-rwxr-xr-xscripts/build/binary_linux-image2
-rwxr-xr-xscripts/build/binary_loadlin2
-rwxr-xr-xscripts/build/binary_loopback_cfg2
-rwxr-xr-xscripts/build/binary_manifest2
-rwxr-xr-xscripts/build/binary_memtest2
-rwxr-xr-xscripts/build/binary_netboot2
-rwxr-xr-xscripts/build/binary_package-lists2
-rwxr-xr-xscripts/build/binary_rootfs2
-rwxr-xr-xscripts/build/binary_syslinux2
-rwxr-xr-xscripts/build/binary_tar2
-rwxr-xr-xscripts/build/binary_win32-loader2
-rwxr-xr-xscripts/build/binary_zsync2
-rwxr-xr-xscripts/build/bootstrap2
-rwxr-xr-xscripts/build/bootstrap_archive-keys2
-rwxr-xr-xscripts/build/bootstrap_archives2
-rwxr-xr-xscripts/build/bootstrap_cache2
-rwxr-xr-xscripts/build/bootstrap_debootstrap2
-rwxr-xr-xscripts/build/build2
-rwxr-xr-xscripts/build/chroot2
-rwxr-xr-xscripts/build/chroot_apt2
-rwxr-xr-xscripts/build/chroot_archives2
-rwxr-xr-xscripts/build/chroot_cache2
-rwxr-xr-xscripts/build/chroot_debianchroot2
-rwxr-xr-xscripts/build/chroot_devpts2
-rwxr-xr-xscripts/build/chroot_dpkg2
-rwxr-xr-xscripts/build/chroot_firmware2
-rwxr-xr-xscripts/build/chroot_hacks2
-rwxr-xr-xscripts/build/chroot_hooks2
-rwxr-xr-xscripts/build/chroot_hostname2
-rwxr-xr-xscripts/build/chroot_hosts2
-rwxr-xr-xscripts/build/chroot_includes2
-rwxr-xr-xscripts/build/chroot_install-packages2
-rwxr-xr-xscripts/build/chroot_interactive2
-rwxr-xr-xscripts/build/chroot_linux-image2
-rwxr-xr-xscripts/build/chroot_live-packages2
-rwxr-xr-xscripts/build/chroot_package-lists2
-rwxr-xr-xscripts/build/chroot_preseed2
-rwxr-xr-xscripts/build/chroot_proc2
-rwxr-xr-xscripts/build/chroot_resolv2
-rwxr-xr-xscripts/build/chroot_selinuxfs2
-rwxr-xr-xscripts/build/chroot_sysfs2
-rwxr-xr-xscripts/build/chroot_sysv-rc2
-rwxr-xr-xscripts/build/chroot_tmpfs2
-rwxr-xr-xscripts/build/clean2
-rwxr-xr-xscripts/build/config10
-rwxr-xr-xscripts/build/installer2
-rwxr-xr-xscripts/build/installer_debian-installer2
-rwxr-xr-xscripts/build/installer_preseed2
-rwxr-xr-xscripts/build/source2
-rwxr-xr-xscripts/build/source_checksums2
-rwxr-xr-xscripts/build/source_debian2
-rwxr-xr-xscripts/build/source_debian-live2
-rwxr-xr-xscripts/build/source_disk2
-rwxr-xr-xscripts/build/source_hdd2
-rwxr-xr-xscripts/build/source_hooks2
-rwxr-xr-xscripts/build/source_iso2
-rwxr-xr-xscripts/build/source_live2
-rwxr-xr-xscripts/build/source_tar2
71 files changed, 75 insertions, 75 deletions
diff --git a/examples/auto/clean b/examples/auto/clean
index 69874ee68..7b5ed5ee4 100755
--- a/examples/auto/clean
+++ b/examples/auto/clean
@@ -4,5 +4,5 @@ set -e
lb clean noauto "${@}"
-rm -f config/binary config/bootstrap config/chroot config/common config/source
+rm -f config/binary config/bootstrap config/system config/common config/source
rm -f build.log
diff --git a/examples/gitignore b/examples/gitignore
index 3f88dfad1..c7185465e 100644
--- a/examples/gitignore
+++ b/examples/gitignore
@@ -16,7 +16,7 @@ chroot.packages.*
config/binary
config/bootstrap
-config/chroot
+config/system
config/common
config/source
diff --git a/functions/defaults.sh b/functions/defaults.sh
index eb309408e..57575915f 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -369,7 +369,7 @@ Set_defaults ()
;;
esac
- ## config/chroot
+ ## config/system
# Setting chroot filesystem
LB_CHROOT_FILESYSTEM="${LB_CHROOT_FILESYSTEM:-squashfs}"
diff --git a/scripts/build/binary b/scripts/build/binary
index 56c7bf83a..551431dc2 100755
--- a/scripts/build/binary
+++ b/scripts/build/binary
@@ -28,7 +28,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
# Setup cleanup function
diff --git a/scripts/build/binary_checksums b/scripts/build/binary_checksums
index 910d7b56e..a64334e06 100755
--- a/scripts/build/binary_checksums
+++ b/scripts/build/binary_checksums
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
if [ "${LB_CHECKSUMS}" = "none" ]
diff --git a/scripts/build/binary_chroot b/scripts/build/binary_chroot
index 6f6e71200..d809b7fed 100755
--- a/scripts/build/binary_chroot
+++ b/scripts/build/binary_chroot
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
Echo_message "Begin copying chroot..."
diff --git a/scripts/build/binary_disk b/scripts/build/binary_disk
index 7175a543a..7ddcc3555 100755
--- a/scripts/build/binary_disk
+++ b/scripts/build/binary_disk
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
case "${LIVE_IMAGE_TYPE}" in
diff --git a/scripts/build/binary_grub-legacy b/scripts/build/binary_grub-legacy
index de710008d..a9fb74b98 100755
--- a/scripts/build/binary_grub-legacy
+++ b/scripts/build/binary_grub-legacy
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
FOUND_MYSELF=""
diff --git a/scripts/build/binary_grub-pc b/scripts/build/binary_grub-pc
index db7f528a8..f3a6450f4 100755
--- a/scripts/build/binary_grub-pc
+++ b/scripts/build/binary_grub-pc
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
FOUND_MYSELF=""
diff --git a/scripts/build/binary_hdd b/scripts/build/binary_hdd
index 238e41c90..1e7489c57 100755
--- a/scripts/build/binary_hdd
+++ b/scripts/build/binary_hdd
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
if ! In_list hdd "${LIVE_IMAGE_TYPE}"
diff --git a/scripts/build/binary_hooks b/scripts/build/binary_hooks
index ffedec12e..0458ce978 100755
--- a/scripts/build/binary_hooks
+++ b/scripts/build/binary_hooks
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
Echo_message "Begin executing hooks..."
diff --git a/scripts/build/binary_includes b/scripts/build/binary_includes
index bed9e5dbf..48bb6e5a5 100755
--- a/scripts/build/binary_includes
+++ b/scripts/build/binary_includes
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
Echo_message "Begin copying binary includes..."
diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso
index c495d81e0..bd659a21b 100755
--- a/scripts/build/binary_iso
+++ b/scripts/build/binary_iso
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
case "${LIVE_IMAGE_TYPE}" in
diff --git a/scripts/build/binary_linux-image b/scripts/build/binary_linux-image
index 05556f1c2..34676ce3e 100755
--- a/scripts/build/binary_linux-image
+++ b/scripts/build/binary_linux-image
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
if [ "${LB_LINUX_PACKAGES}" = "none" ]
diff --git a/scripts/build/binary_loadlin b/scripts/build/binary_loadlin
index 69f740beb..1fed0a530 100755
--- a/scripts/build/binary_loadlin
+++ b/scripts/build/binary_loadlin
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
if [ "${LB_LOADLIN}" != "true" ] || [ "${LB_BINARY_IMAGES}" = "netboot" ]
diff --git a/scripts/build/binary_loopback_cfg b/scripts/build/binary_loopback_cfg
index 76e552007..87c1d67b4 100755
--- a/scripts/build/binary_loopback_cfg
+++ b/scripts/build/binary_loopback_cfg
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
# We avoid checking if we need to be running this bootloader
diff --git a/scripts/build/binary_manifest b/scripts/build/binary_manifest
index b7804528e..55c652080 100755
--- a/scripts/build/binary_manifest
+++ b/scripts/build/binary_manifest
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
if [ "${LB_CHROOT_FILESYSTEM}" = "none" ]
diff --git a/scripts/build/binary_memtest b/scripts/build/binary_memtest
index f756cf183..1ce419574 100755
--- a/scripts/build/binary_memtest
+++ b/scripts/build/binary_memtest
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
if [ "${LB_MEMTEST}" = "false" ] || [ "${LB_MEMTEST}" = "none" ] || [ "${LB_CHROOT_FILESYSTEM}" = "none" ]
diff --git a/scripts/build/binary_netboot b/scripts/build/binary_netboot
index 7a94b4fd0..d8cfe5153 100755
--- a/scripts/build/binary_netboot
+++ b/scripts/build/binary_netboot
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
if ! In_list netboot "${LIVE_IMAGE_TYPE}"
diff --git a/scripts/build/binary_package-lists b/scripts/build/binary_package-lists
index dcbadccb5..fc4715405 100755
--- a/scripts/build/binary_package-lists
+++ b/scripts/build/binary_package-lists
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
Echo_message "Begin installing local package lists..."
diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs
index 8714c19d9..f230d1785 100755
--- a/scripts/build/binary_rootfs
+++ b/scripts/build/binary_rootfs
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
Echo_message "Begin building root filesystem image..."
diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux
index 1c79ec78c..3224d21c3 100755
--- a/scripts/build/binary_syslinux
+++ b/scripts/build/binary_syslinux
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
FOUND_MYSELF=""
diff --git a/scripts/build/binary_tar b/scripts/build/binary_tar
index 042d0eb07..2200586d3 100755
--- a/scripts/build/binary_tar
+++ b/scripts/build/binary_tar
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
if ! In_list tar "${LIVE_IMAGE_TYPE}"
diff --git a/scripts/build/binary_win32-loader b/scripts/build/binary_win32-loader
index eecb6b263..b04103ac8 100755
--- a/scripts/build/binary_win32-loader
+++ b/scripts/build/binary_win32-loader
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
if [ "${LB_WIN32_LOADER}" != "true" ]
diff --git a/scripts/build/binary_zsync b/scripts/build/binary_zsync
index a38bd60ea..83fdb55f4 100755
--- a/scripts/build/binary_zsync
+++ b/scripts/build/binary_zsync
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
if [ "${LIVE_IMAGE_TYPE}" != "iso" ] && [ "${LIVE_IMAGE_TYPE}" != "iso-hybrid" ]
diff --git a/scripts/build/bootstrap b/scripts/build/bootstrap
index 486f99cc3..48f2119d1 100755
--- a/scripts/build/bootstrap
+++ b/scripts/build/bootstrap
@@ -28,7 +28,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
# Setup cleanup function
diff --git a/scripts/build/bootstrap_archive-keys b/scripts/build/bootstrap_archive-keys
index 48d080434..3f4fd45da 100755
--- a/scripts/build/bootstrap_archive-keys
+++ b/scripts/build/bootstrap_archive-keys
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
# TODO: allow verification against user-specified keyring
diff --git a/scripts/build/bootstrap_archives b/scripts/build/bootstrap_archives
index 6d9773519..4e070514f 100755
--- a/scripts/build/bootstrap_archives
+++ b/scripts/build/bootstrap_archives
@@ -27,7 +27,7 @@ fi
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
# Requiring stage file
diff --git a/scripts/build/bootstrap_cache b/scripts/build/bootstrap_cache
index 5dad3c68b..bef9e5e00 100755
--- a/scripts/build/bootstrap_cache
+++ b/scripts/build/bootstrap_cache
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
# Check architecture
diff --git a/scripts/build/bootstrap_debootstrap b/scripts/build/bootstrap_debootstrap
index 05db49270..27af14fce 100755
--- a/scripts/build/bootstrap_debootstrap
+++ b/scripts/build/bootstrap_debootstrap
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
if [ ! -x "$(which debootstrap 2>/dev/null)" ]
diff --git a/scripts/build/build b/scripts/build/build
index c0f26b92d..18971eae5 100755
--- a/scripts/build/build
+++ b/scripts/build/build
@@ -59,7 +59,7 @@ then
fi
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
# Checking defaults
diff --git a/scripts/build/chroot b/scripts/build/chroot
index 025bec8af..d6277e6e4 100755
--- a/scripts/build/chroot
+++ b/scripts/build/chroot
@@ -28,7 +28,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
# Setup cleanup function
diff --git a/scripts/build/chroot_apt b/scripts/build/chroot_apt
index c0d5fb146..5f7c2cc79 100755
--- a/scripts/build/chroot_apt
+++ b/scripts/build/chroot_apt
@@ -21,7 +21,7 @@ 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
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
# Requiring stage file
diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives
index 292233e00..063f3b6a0 100755
--- a/scripts/build/chroot_archives
+++ b/scripts/build/chroot_archives
@@ -24,7 +24,7 @@ shift
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
# Requiring stage file
diff --git a/scripts/build/chroot_cache b/scripts/build/chroot_cache
index f0a35e911..96f7af227 100755
--- a/scripts/build/chroot_cache
+++ b/scripts/build/chroot_cache
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
for STAGE in ${LB_CACHE_STAGES}
diff --git a/scripts/build/chroot_debianchroot b/scripts/build/chroot_debianchroot
index 3f0a3437d..77680f009 100755
--- a/scripts/build/chroot_debianchroot
+++ b/scripts/build/chroot_debianchroot
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
# Requiring stage file
diff --git a/scripts/build/chroot_devpts b/scripts/build/chroot_devpts
index d917bc4d4..8fb76a72e 100755
--- a/scripts/build/chroot_devpts
+++ b/scripts/build/chroot_devpts
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
# Requiring stage file
diff --git a/scripts/build/chroot_dpkg b/scripts/build/chroot_dpkg
index b02dc648f..c6f15741a 100755
--- a/scripts/build/chroot_dpkg
+++ b/scripts/build/chroot_dpkg
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
# Requiring stage file
diff --git a/scripts/build/chroot_firmware b/scripts/build/chroot_firmware
index d9455bbac..d91f5700b 100755
--- a/scripts/build/chroot_firmware
+++ b/scripts/build/chroot_firmware
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
if [ "${LB_FIRMWARE_CHROOT}" != "true" ]
diff --git a/scripts/build/chroot_hacks b/scripts/build/chroot_hacks
index 20eb1afdf..f439ca12a 100755
--- a/scripts/build/chroot_hacks
+++ b/scripts/build/chroot_hacks
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
Echo_message "Begin executing hacks..."
diff --git a/scripts/build/chroot_hooks b/scripts/build/chroot_hooks
index 4fbacdbf3..af20b0dc9 100755
--- a/scripts/build/chroot_hooks
+++ b/scripts/build/chroot_hooks
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
Echo_message "Begin executing hooks..."
diff --git a/scripts/build/chroot_hostname b/scripts/build/chroot_hostname
index e30858ea0..ae191a78a 100755
--- a/scripts/build/chroot_hostname
+++ b/scripts/build/chroot_hostname
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
# Requiring stage file
diff --git a/scripts/build/chroot_hosts b/scripts/build/chroot_hosts
index ab0ea6685..9f0da29cc 100755
--- a/scripts/build/chroot_hosts
+++ b/scripts/build/chroot_hosts
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
# Requiring stage file
diff --git a/scripts/build/chroot_includes b/scripts/build/chroot_includes
index 21c0e261b..6498aa305 100755
--- a/scripts/build/chroot_includes
+++ b/scripts/build/chroot_includes
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
Echo_message "Begin copying chroot includes..."
diff --git a/scripts/build/chroot_install-packages b/scripts/build/chroot_install-packages
index 755f0a2dc..36c0f9331 100755
--- a/scripts/build/chroot_install-packages
+++ b/scripts/build/chroot_install-packages
@@ -25,7 +25,7 @@ shift
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
Echo_message "Begin installing packages (${_PASS} pass)..."
diff --git a/scripts/build/chroot_interactive b/scripts/build/chroot_interactive
index c665a2f08..f21b6dd32 100755
--- a/scripts/build/chroot_interactive
+++ b/scripts/build/chroot_interactive
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
if [ "${LB_INTERACTIVE}" = "false" ]
diff --git a/scripts/build/chroot_linux-image b/scripts/build/chroot_linux-image
index 5c9aeb353..c28cb54b5 100755
--- a/scripts/build/chroot_linux-image
+++ b/scripts/build/chroot_linux-image
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
if [ "${LB_LINUX_PACKAGES}" = "none" ]
diff --git a/scripts/build/chroot_live-packages b/scripts/build/chroot_live-packages
index 1a38fb65c..0e4f2bf98 100755
--- a/scripts/build/chroot_live-packages
+++ b/scripts/build/chroot_live-packages
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
# Requiring stage file
diff --git a/scripts/build/chroot_package-lists b/scripts/build/chroot_package-lists
index d64fe49e0..7e93e6173 100755
--- a/scripts/build/chroot_package-lists
+++ b/scripts/build/chroot_package-lists
@@ -24,7 +24,7 @@ shift
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
Echo_message "Begin queueing installation of package lists (${_PASS} pass)..."
diff --git a/scripts/build/chroot_preseed b/scripts/build/chroot_preseed
index ab04df054..53bd8df95 100755
--- a/scripts/build/chroot_preseed
+++ b/scripts/build/chroot_preseed
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
Echo_message "Begin executing local preseeds..."
diff --git a/scripts/build/chroot_proc b/scripts/build/chroot_proc
index 23b184249..f84c0d42c 100755
--- a/scripts/build/chroot_proc
+++ b/scripts/build/chroot_proc
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
# Requiring stage file
diff --git a/scripts/build/chroot_resolv b/scripts/build/chroot_resolv
index c976d61d0..7cf55fc10 100755
--- a/scripts/build/chroot_resolv
+++ b/scripts/build/chroot_resolv
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
# Requiring stage file
diff --git a/scripts/build/chroot_selinuxfs b/scripts/build/chroot_selinuxfs
index 7f9850926..66d463994 100755
--- a/scripts/build/chroot_selinuxfs
+++ b/scripts/build/chroot_selinuxfs
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
# Requiring stage file
diff --git a/scripts/build/chroot_sysfs b/scripts/build/chroot_sysfs
index cccf0ce91..a0637f151 100755
--- a/scripts/build/chroot_sysfs
+++ b/scripts/build/chroot_sysfs
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
# Requiring stage file
diff --git a/scripts/build/chroot_sysv-rc b/scripts/build/chroot_sysv-rc
index 67db660da..a613fd430 100755
--- a/scripts/build/chroot_sysv-rc
+++ b/scripts/build/chroot_sysv-rc
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
# Requiring stage file
diff --git a/scripts/build/chroot_tmpfs b/scripts/build/chroot_tmpfs
index 0f7a9cc71..a7a1d7214 100755
--- a/scripts/build/chroot_tmpfs
+++ b/scripts/build/chroot_tmpfs
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} {install|remove} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
if [ "${LB_BUILD_WITH_TMPFS}" != "true" ]
diff --git a/scripts/build/clean b/scripts/build/clean
index 9c704a0b5..a40b51dbc 100755
--- 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 config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
# Avoid cases were users accidentally nuke their config/binary
diff --git a/scripts/build/config b/scripts/build/config
index fe1e93afa..fc710a397 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -170,7 +170,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 config/all config/common config/bootstrap config/system config/binary config/source
# Dump contents of directories that contain text files
for DIRECTORY in config/package-lists config/apt config/preseed config/rootfs
@@ -408,7 +408,7 @@ Local_arguments ()
shift 2
;;
- # config/chroot
+ # config/system
--chroot-filesystem)
LB_CHROOT_FILESYSTEM="${2}"
shift 2
@@ -848,7 +848,7 @@ then
fi
# Reading existing configuration
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Local_arguments "${@}"
@@ -1073,8 +1073,8 @@ mkdir -p config/packages.chroot
mkdir -p config/package-lists
mkdir -p config/preseed
-cat > config/chroot << EOF
-# config/chroot - options for live-build(7), chroot stage
+cat > config/system << EOF
+# config/system - options for live-build(7), chroot stage
# \$LB_CHROOT_FILESYSTEM: set chroot filesystem
# (Default: ${LB_CHROOT_FILESYSTEM})
diff --git a/scripts/build/installer b/scripts/build/installer
index f60fe8136..8ef2edd08 100755
--- a/scripts/build/installer
+++ b/scripts/build/installer
@@ -28,7 +28,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
# Setup cleanup function
diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer
index ec931fa68..3f13915ff 100755
--- a/scripts/build/installer_debian-installer
+++ b/scripts/build/installer_debian-installer
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
if [ "${_DEBUG}" = "true" ]
diff --git a/scripts/build/installer_preseed b/scripts/build/installer_preseed
index 798c6ae68..f17102a46 100755
--- a/scripts/build/installer_preseed
+++ b/scripts/build/installer_preseed
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
diff --git a/scripts/build/source b/scripts/build/source
index a0d4f4af8..4d4f9bd91 100755
--- a/scripts/build/source
+++ b/scripts/build/source
@@ -28,7 +28,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
if [ "${LB_SOURCE}" != "true" ]
diff --git a/scripts/build/source_checksums b/scripts/build/source_checksums
index b7918561c..8b3172fc8 100755
--- a/scripts/build/source_checksums
+++ b/scripts/build/source_checksums
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
if [ "${LB_CHECKSUMS}" = "none" ] || [ "${LB_SOURCE}" != "true" ]
diff --git a/scripts/build/source_debian b/scripts/build/source_debian
index 321ed1b4a..49e53db5e 100755
--- a/scripts/build/source_debian
+++ b/scripts/build/source_debian
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
if [ "${LB_SOURCE}" != "true" ]
diff --git a/scripts/build/source_debian-live b/scripts/build/source_debian-live
index d1ce39236..3af41e51d 100755
--- a/scripts/build/source_debian-live
+++ b/scripts/build/source_debian-live
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
if [ "${LB_SOURCE}" != "true" ]
diff --git a/scripts/build/source_disk b/scripts/build/source_disk
index eaaf7d2dd..9cac2b3a0 100755
--- a/scripts/build/source_disk
+++ b/scripts/build/source_disk
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
case "${LB_SOURCE_IMAGES}" in
diff --git a/scripts/build/source_hdd b/scripts/build/source_hdd
index 6788c011b..e9947ab45 100755
--- a/scripts/build/source_hdd
+++ b/scripts/build/source_hdd
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
if [ "${LB_SOURCE}" != "true" ]
diff --git a/scripts/build/source_hooks b/scripts/build/source_hooks
index feff063c8..4a7b1a4f5 100755
--- a/scripts/build/source_hooks
+++ b/scripts/build/source_hooks
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/source config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/source config/source
Set_defaults
Echo_message "Begin executing hooks..."
diff --git a/scripts/build/source_iso b/scripts/build/source_iso
index c280d30be..b0b3036a6 100755
--- a/scripts/build/source_iso
+++ b/scripts/build/source_iso
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
if [ "${LB_SOURCE}" != "true" ]
diff --git a/scripts/build/source_live b/scripts/build/source_live
index b46eaf299..67e71c91b 100755
--- a/scripts/build/source_live
+++ b/scripts/build/source_live
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
if [ "${LB_SOURCE}" != "true" ]
diff --git a/scripts/build/source_tar b/scripts/build/source_tar
index c5d75080e..d4b3555f6 100755
--- a/scripts/build/source_tar
+++ b/scripts/build/source_tar
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
Arguments "${@}"
# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Read_conffiles config/all config/common config/bootstrap config/system config/binary config/source
Set_defaults
if [ "${LB_SOURCE}" != "true" ]