Enforcing lh_config to be run before lh_build, see also http://lists.debian.org/debian-live/2008/10/msg00102.html (Closes: #500740).

59 files changed, 61 insertions, 58 deletions

diff --git a/helpers/lh_binary_chroot b/helpers/lh_binary_chroot
index 0d596b244..1300f92f2 100755
--- a/helpers/lh_binary_chroot
+++ b/helpers/lh_binary_chroot
@@ -31,7 +31,7 @@ Set_defaults
 Echo_message "Begin copying chroot..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/binary_chroot
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index b352a2a47..e536f202a 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -56,7 +56,7 @@ esac
 Echo_message "Begin installing debian-installer..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/binary_debian-installer
diff --git a/helpers/lh_binary_disk b/helpers/lh_binary_disk
index 7cb707f21..ddd235813 100755
--- a/helpers/lh_binary_disk
+++ b/helpers/lh_binary_disk
@@ -39,7 +39,7 @@ esac
 Echo_message "Begin installing disk information..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/binary_disk
diff --git a/helpers/lh_binary_encryption b/helpers/lh_binary_encryption
index 480c382f1..cf8957415 100755
--- a/helpers/lh_binary_encryption
+++ b/helpers/lh_binary_encryption
@@ -53,7 +53,7 @@ esac
 Echo_message "Begin encrypting root filesystem image..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap .stage/binary_rootfs
+Require_stagefile .stage/config .stage/bootstrap .stage/binary_rootfs
 
 # Checking stage file
 Check_stagefile .stage/binary_encryption
diff --git a/helpers/lh_binary_grub b/helpers/lh_binary_grub
index 1c9a8046d..064855249 100755
--- a/helpers/lh_binary_grub
+++ b/helpers/lh_binary_grub
@@ -36,7 +36,7 @@ fi
 Echo_message "Begin installing grub..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/binary_grub
diff --git a/helpers/lh_binary_includes b/helpers/lh_binary_includes
index c90e75c9c..6448c0bdb 100755
--- a/helpers/lh_binary_includes
+++ b/helpers/lh_binary_includes
@@ -36,7 +36,7 @@ fi
 Echo_message "Begin copying binary includes..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/binary_includes
diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso
index 0fc09e275..82f4bf576 100755
--- a/helpers/lh_binary_iso
+++ b/helpers/lh_binary_iso
@@ -36,7 +36,7 @@ fi
 Echo_message "Begin building binary iso image..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/binary_iso
diff --git a/helpers/lh_binary_linux-image b/helpers/lh_binary_linux-image
index a4a34437b..a241e5920 100755
--- a/helpers/lh_binary_linux-image
+++ b/helpers/lh_binary_linux-image
@@ -31,7 +31,7 @@ Set_defaults
 Echo_message "Begin install linux-image..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/binary_linux-image
diff --git a/helpers/lh_binary_local-hooks b/helpers/lh_binary_local-hooks
index 92c4ea012..96ed5eaa3 100755
--- a/helpers/lh_binary_local-hooks
+++ b/helpers/lh_binary_local-hooks
@@ -31,7 +31,7 @@ Set_defaults
 Echo_message "Begin executing local hooks..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/binary_local-hooks
diff --git a/helpers/lh_binary_local-includes b/helpers/lh_binary_local-includes
index dc489ec0e..d28918c3c 100755
--- a/helpers/lh_binary_local-includes
+++ b/helpers/lh_binary_local-includes
@@ -31,7 +31,7 @@ Set_defaults
 Echo_message "Begin copying binary local includes..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/binary_local-includes
diff --git a/helpers/lh_binary_local-packageslists b/helpers/lh_binary_local-packageslists
index 144b1a62b..28423a9b7 100755
--- a/helpers/lh_binary_local-packageslists
+++ b/helpers/lh_binary_local-packageslists
@@ -31,7 +31,7 @@ Set_defaults
 Echo_message "Begin installing local packages lists..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/binary_local-packageslists
diff --git a/helpers/lh_binary_manifest b/helpers/lh_binary_manifest
index b5e558a0b..c731c06d0 100755
--- a/helpers/lh_binary_manifest
+++ b/helpers/lh_binary_manifest
@@ -31,7 +31,7 @@ Set_defaults
 Echo_message "Begin creating manifest..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/binary_manifest
diff --git a/helpers/lh_binary_md5sum b/helpers/lh_binary_md5sum
index 14ecaa33e..416010795 100755
--- a/helpers/lh_binary_md5sum
+++ b/helpers/lh_binary_md5sum
@@ -36,7 +36,7 @@ fi
 Echo_message "Begin creating binary md5sum.txt..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/binary_md5sum
diff --git a/helpers/lh_binary_memtest b/helpers/lh_binary_memtest
index 083e47763..45e309180 100755
--- a/helpers/lh_binary_memtest
+++ b/helpers/lh_binary_memtest
@@ -36,7 +36,7 @@ fi
 Echo_message "Begin installing memtest..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/binary_memtest
diff --git a/helpers/lh_binary_net b/helpers/lh_binary_net
index 903766226..88d530c2d 100755
--- a/helpers/lh_binary_net
+++ b/helpers/lh_binary_net
@@ -41,7 +41,7 @@ fi
 Echo_message "Begin building binary netboot image..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/binary_net
diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs
index e48b0722e..07159e718 100755
--- a/helpers/lh_binary_rootfs
+++ b/helpers/lh_binary_rootfs
@@ -31,7 +31,7 @@ Set_defaults
 Echo_message "Begin building root filesystem image..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap .stage/binary_chroot
+Require_stagefile .stage/config .stage/bootstrap .stage/binary_chroot
 
 # Checking stage file
 Check_stagefile .stage/binary_rootfs
diff --git a/helpers/lh_binary_silo b/helpers/lh_binary_silo
index 8bddb2b26..7a64f971e 100755
--- a/helpers/lh_binary_silo
+++ b/helpers/lh_binary_silo
@@ -47,7 +47,7 @@ esac
 Echo_message "Begin installing silo..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/binary_silo
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 1763519ea..529b39253 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -36,7 +36,7 @@ fi
 Echo_message "Begin installing syslinux..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/binary_syslinux
diff --git a/helpers/lh_binary_tar b/helpers/lh_binary_tar
index 8fb5a3ab3..74ea19d67 100755
--- a/helpers/lh_binary_tar
+++ b/helpers/lh_binary_tar
@@ -36,7 +36,7 @@ fi
 Echo_message "Begin building binary harddisk image..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/binary_tar
diff --git a/helpers/lh_binary_usb-hdd b/helpers/lh_binary_usb-hdd
index 315cf7956..29136762a 100755
--- a/helpers/lh_binary_usb-hdd
+++ b/helpers/lh_binary_usb-hdd
@@ -36,7 +36,7 @@ fi
 Echo_message "Begin building binary usb-hdd image..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap .stage/chroot_proc
+Require_stagefile .stage/config .stage/bootstrap .stage/chroot_proc
 
 # Checking stage file
 Check_stagefile .stage/binary_usb-hdd
diff --git a/helpers/lh_binary_yaboot b/helpers/lh_binary_yaboot
index 189a9f4f1..e4a442bc4 100755
--- a/helpers/lh_binary_yaboot
+++ b/helpers/lh_binary_yaboot
@@ -36,7 +36,7 @@ fi
 Echo_message "Begin installing yaboot..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/binary_yaboot
diff --git a/helpers/lh_chroot_apt b/helpers/lh_chroot_apt
index 111adb969..adc6c2025 100755
--- a/helpers/lh_chroot_apt
+++ b/helpers/lh_chroot_apt
@@ -29,7 +29,7 @@ Read_conffile config/all config/common config/bootstrap config/chroot config/bin
 Set_defaults
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 case "${1}" in
 	install|install-binary)
diff --git a/helpers/lh_chroot_debianchroot b/helpers/lh_chroot_debianchroot
index 29a28dbde..1baeb812e 100755
--- a/helpers/lh_chroot_debianchroot
+++ b/helpers/lh_chroot_debianchroot
@@ -29,7 +29,7 @@ Read_conffile config/all config/common config/bootstrap config/chroot config/bin
 Set_defaults
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 case "${1}" in
 	install)
diff --git a/helpers/lh_chroot_devpts b/helpers/lh_chroot_devpts
index f59e91f18..993019f4a 100755
--- a/helpers/lh_chroot_devpts
+++ b/helpers/lh_chroot_devpts
@@ -32,7 +32,7 @@ Read_conffile config/all config/common config/bootstrap config/chroot config/bin
 Set_defaults
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 case "${1}" in
 	install)
diff --git a/helpers/lh_chroot_dpkg b/helpers/lh_chroot_dpkg
index 4a13b8d2c..6c2b86e90 100755
--- a/helpers/lh_chroot_dpkg
+++ b/helpers/lh_chroot_dpkg
@@ -29,7 +29,7 @@ Read_conffile config/all config/common config/bootstrap config/chroot config/bin
 Set_defaults
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 case "${1}" in
 	install)
diff --git a/helpers/lh_chroot_hacks b/helpers/lh_chroot_hacks
index a2021798c..f366d8cf0 100755
--- a/helpers/lh_chroot_hacks
+++ b/helpers/lh_chroot_hacks
@@ -31,7 +31,7 @@ Set_defaults
 Echo_message "Begin executing hacks..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/chroot_hacks
diff --git a/helpers/lh_chroot_hooks b/helpers/lh_chroot_hooks
index 4e82a9f36..800e5d446 100755
--- a/helpers/lh_chroot_hooks
+++ b/helpers/lh_chroot_hooks
@@ -31,7 +31,7 @@ Set_defaults
 Echo_message "Begin executing hooks..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/chroot_hooks
diff --git a/helpers/lh_chroot_hostname b/helpers/lh_chroot_hostname
index 5d4355422..cea01b079 100755
--- a/helpers/lh_chroot_hostname
+++ b/helpers/lh_chroot_hostname
@@ -29,7 +29,7 @@ Read_conffile config/all config/common config/bootstrap config/chroot config/bin
 Set_defaults
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 case "${1}" in
 	install)
diff --git a/helpers/lh_chroot_hosts b/helpers/lh_chroot_hosts
index 3f9ca83f6..a5ba430a0 100755
--- a/helpers/lh_chroot_hosts
+++ b/helpers/lh_chroot_hosts
@@ -29,7 +29,7 @@ Read_conffile config/all config/common config/bootstrap config/chroot config/bin
 Set_defaults
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 case "${1}" in
 	install)
diff --git a/helpers/lh_chroot_install-packages b/helpers/lh_chroot_install-packages
index e8e0ec12e..d68ce10d1 100755
--- a/helpers/lh_chroot_install-packages
+++ b/helpers/lh_chroot_install-packages
@@ -31,7 +31,7 @@ Set_defaults
 Echo_message "Begin installing packages..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/chroot_install-packages
diff --git a/helpers/lh_chroot_interactive b/helpers/lh_chroot_interactive
index 3f2281662..b8ebb9daf 100755
--- a/helpers/lh_chroot_interactive
+++ b/helpers/lh_chroot_interactive
@@ -36,7 +36,7 @@ fi
 Echo_message "Begin interactive build..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/chroot_interactive
diff --git a/helpers/lh_chroot_linux-image b/helpers/lh_chroot_linux-image
index 56f4da45f..849a4ab2a 100755
--- a/helpers/lh_chroot_linux-image
+++ b/helpers/lh_chroot_linux-image
@@ -29,7 +29,7 @@ Read_conffile config/all config/common config/bootstrap config/chroot config/bin
 Set_defaults
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 case "${1}" in
 	install)
diff --git a/helpers/lh_chroot_local-hooks b/helpers/lh_chroot_local-hooks
index 0b8cd5202..09361da87 100755
--- a/helpers/lh_chroot_local-hooks
+++ b/helpers/lh_chroot_local-hooks
@@ -31,7 +31,7 @@ Set_defaults
 Echo_message "Begin executing local hooks..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/chroot_local-hooks
diff --git a/helpers/lh_chroot_local-includes b/helpers/lh_chroot_local-includes
index ecb68c777..20d19c933 100755
--- a/helpers/lh_chroot_local-includes
+++ b/helpers/lh_chroot_local-includes
@@ -31,7 +31,7 @@ Set_defaults
 Echo_message "Begin copying chroot local includes..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/chroot_local-includes
diff --git a/helpers/lh_chroot_local-packages b/helpers/lh_chroot_local-packages
index 1ea7c737f..4ede71365 100755
--- a/helpers/lh_chroot_local-packages
+++ b/helpers/lh_chroot_local-packages
@@ -31,7 +31,7 @@ Set_defaults
 Echo_message "Begin queueing installation of local packages..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/chroot_local-packages
diff --git a/helpers/lh_chroot_local-patches b/helpers/lh_chroot_local-patches
index 7f77675d3..3d244370c 100755
--- a/helpers/lh_chroot_local-patches
+++ b/helpers/lh_chroot_local-patches
@@ -31,7 +31,7 @@ Set_defaults
 Echo_message "Begin applying chroot local patches..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/chroot_local-patches
diff --git a/helpers/lh_chroot_local-preseed b/helpers/lh_chroot_local-preseed
index e279faa5b..807bae90b 100755
--- a/helpers/lh_chroot_local-preseed
+++ b/helpers/lh_chroot_local-preseed
@@ -31,7 +31,7 @@ Set_defaults
 Echo_message "Begin executing local preseeds..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/chroot_local-preseed
diff --git a/helpers/lh_chroot_localization b/helpers/lh_chroot_localization
index 4a69e9972..f9758f39f 100755
--- a/helpers/lh_chroot_localization
+++ b/helpers/lh_chroot_localization
@@ -31,7 +31,7 @@ Set_defaults
 Echo_message "Begin installing localization packages..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/chroot_localization
diff --git a/helpers/lh_chroot_packages b/helpers/lh_chroot_packages
index 5ecb484e4..132d8c4dc 100755
--- a/helpers/lh_chroot_packages
+++ b/helpers/lh_chroot_packages
@@ -31,7 +31,7 @@ Set_defaults
 Echo_message "Begin queueing installation of packages..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/chroot_packages
diff --git a/helpers/lh_chroot_packageslists b/helpers/lh_chroot_packageslists
index 956955004..5a1558c92 100755
--- a/helpers/lh_chroot_packageslists
+++ b/helpers/lh_chroot_packageslists
@@ -31,7 +31,7 @@ Set_defaults
 Echo_message "Begin queueing installation of packages lists..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/chroot_packageslists
diff --git a/helpers/lh_chroot_preseed b/helpers/lh_chroot_preseed
index 89da6b896..51be962aa 100755
--- a/helpers/lh_chroot_preseed
+++ b/helpers/lh_chroot_preseed
@@ -31,7 +31,7 @@ Set_defaults
 Echo_message "Begin executing preseed..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/chroot_preseed
diff --git a/helpers/lh_chroot_proc b/helpers/lh_chroot_proc
index 0cb52058c..b0b062727 100755
--- a/helpers/lh_chroot_proc
+++ b/helpers/lh_chroot_proc
@@ -32,7 +32,7 @@ Read_conffile config/all config/common config/bootstrap config/chroot config/bin
 Set_defaults
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 case "${1}" in
 	install)
diff --git a/helpers/lh_chroot_resolv b/helpers/lh_chroot_resolv
index 51cf7346c..f678a9a83 100755
--- a/helpers/lh_chroot_resolv
+++ b/helpers/lh_chroot_resolv
@@ -29,7 +29,7 @@ Read_conffile config/all config/common config/bootstrap config/chroot config/bin
 Set_defaults
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 case "${1}" in
 	install)
diff --git a/helpers/lh_chroot_selinuxfs b/helpers/lh_chroot_selinuxfs
index ce19730e2..c44aea07e 100755
--- a/helpers/lh_chroot_selinuxfs
+++ b/helpers/lh_chroot_selinuxfs
@@ -32,7 +32,7 @@ Read_conffile config/all config/common config/bootstrap config/chroot config/bin
 Set_defaults
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 case "${1}" in
 	install)
diff --git a/helpers/lh_chroot_sources b/helpers/lh_chroot_sources
index c3da627b0..48da34483 100755
--- a/helpers/lh_chroot_sources
+++ b/helpers/lh_chroot_sources
@@ -29,7 +29,7 @@ Read_conffile config/all config/common config/bootstrap config/chroot config/bin
 Set_defaults
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 _LH_LOCAL_KEY_EMAIL="live-helper-local-key@invalid"
 
diff --git a/helpers/lh_chroot_symlinks b/helpers/lh_chroot_symlinks
index ae6fd27be..4763031e5 100755
--- a/helpers/lh_chroot_symlinks
+++ b/helpers/lh_chroot_symlinks
@@ -36,7 +36,7 @@ fi
 Echo_message "Begin converting symlinks..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/chroot_symlinks
diff --git a/helpers/lh_chroot_sysfs b/helpers/lh_chroot_sysfs
index d78dd50e7..05c3b8d3a 100755
--- a/helpers/lh_chroot_sysfs
+++ b/helpers/lh_chroot_sysfs
@@ -32,7 +32,7 @@ Read_conffile config/all config/common config/bootstrap config/chroot config/bin
 Set_defaults
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 case "${1}" in
 	install)
diff --git a/helpers/lh_chroot_sysv-rc b/helpers/lh_chroot_sysv-rc
index d4e9352c7..b82f0871b 100755
--- a/helpers/lh_chroot_sysv-rc
+++ b/helpers/lh_chroot_sysv-rc
@@ -29,7 +29,7 @@ Read_conffile config/all config/common config/bootstrap config/chroot config/bin
 Set_defaults
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 case "${1}" in
 	install)
diff --git a/helpers/lh_chroot_sysvinit b/helpers/lh_chroot_sysvinit
index fbb35be69..6f6916914 100755
--- a/helpers/lh_chroot_sysvinit
+++ b/helpers/lh_chroot_sysvinit
@@ -31,7 +31,7 @@ Set_defaults
 Echo_message "Configuring package sysvinit"
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/chroot_sysvinit
diff --git a/helpers/lh_chroot_tasks b/helpers/lh_chroot_tasks
index 9d3a15bf8..d3abdf4a3 100755
--- a/helpers/lh_chroot_tasks
+++ b/helpers/lh_chroot_tasks
@@ -31,7 +31,7 @@ Set_defaults
 Echo_message "Begin installing tasks..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/chroot_tasks
diff --git a/helpers/lh_config b/helpers/lh_config
index 68e89d6e0..4ac6353f0 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -1171,3 +1171,6 @@ then
 		debconf-get-selections | grep -v deinstall | cut -f1 > config/chroot_local-preseed/local-system
 	fi
 fi
+
+# Creating stage file
+Create_stagefile .stage/config
diff --git a/helpers/lh_source_debian b/helpers/lh_source_debian
index fd98e2091..5e391dd3e 100755
--- a/helpers/lh_source_debian
+++ b/helpers/lh_source_debian
@@ -36,7 +36,7 @@ fi
 Echo_message "Begin downloading sources..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/source_debian
diff --git a/helpers/lh_source_debian-live b/helpers/lh_source_debian-live
index 488f913c9..8af129fb9 100755
--- a/helpers/lh_source_debian-live
+++ b/helpers/lh_source_debian-live
@@ -36,7 +36,7 @@ fi
 Echo_message "Begin copying live-helper configuration..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/source_debian-live
diff --git a/helpers/lh_source_disk b/helpers/lh_source_disk
index e61cb4fd8..2e2bded80 100755
--- a/helpers/lh_source_disk
+++ b/helpers/lh_source_disk
@@ -36,7 +36,7 @@ fi
 Echo_message "Begin installing disk information..."
 
 # Requiring stage file
-Require_stagefile .stage/bootstrap
+Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
 Check_stagefile .stage/source_disk
diff --git a/helpers/lh_source_iso b/helpers/lh_source_iso
index 1538727d7..688b27a99 100755
--- a/helpers/lh_source_iso
+++ b/helpers/lh_source_iso
@@ -41,7 +41,7 @@ fi
 Echo_message "Begin building source iso image..."
 
 # Requiring stage file
-Require_stagefile .stage/source_debian
+Require_stagefile .stage/config .stage/source_debian
 
 # Checking stage file
 Check_stagefile .stage/source_iso
diff --git a/helpers/lh_source_md5sum b/helpers/lh_source_md5sum
index 287d2d178..59ab28a9b 100755
--- a/helpers/lh_source_md5sum
+++ b/helpers/lh_source_md5sum
@@ -41,7 +41,7 @@ fi
 Echo_message "Begin creating source md5sum.txt..."
 
 # Requiring stage file
-Require_stagefile .stage/source_debian
+Require_stagefile .stage/config .stage/source_debian
 
 # Checking stage file
 Check_stagefile .stage/source_md5sum
diff --git a/helpers/lh_source_net b/helpers/lh_source_net
index f7b6e71b4..9a4b47866 100755
--- a/helpers/lh_source_net
+++ b/helpers/lh_source_net
@@ -41,7 +41,7 @@ fi
 Echo_message "Begin building source netboot image..."
 
 # Requiring stage file
-Require_stagefile .stage/source_debian
+Require_stagefile .stage/config .stage/source_debian
 
 # Checking stage file
 Check_stagefile .stage/source_net
diff --git a/helpers/lh_source_tar b/helpers/lh_source_tar
index 386db6700..85ba9abe4 100755
--- a/helpers/lh_source_tar
+++ b/helpers/lh_source_tar
@@ -42,7 +42,7 @@ Echo_message "Begin building source tarball..."
 Echo_message "This may take a while."
 
 # Requiring stage file
-Require_stagefile .stage/source_debian
+Require_stagefile .stage/config .stage/source_debian
 
 # Checking stage file
 Check_stagefile .stage/source_tar
diff --git a/helpers/lh_source_usb-hdd b/helpers/lh_source_usb-hdd
index 73949e34b..b6e70faa9 100755
--- a/helpers/lh_source_usb-hdd
+++ b/helpers/lh_source_usb-hdd
@@ -41,7 +41,7 @@ fi
 Echo_message "Begin building source usb-hdd image..."
 
 # Requiring stage file
-Require_stagefile .stage/source_debian
+Require_stagefile .stage/config .stage/source_debian
 
 # Checking stage file
 Check_stagefile .stage/source_usb-hdd