From 6204dc0e6db02859a07a978d87f1a5231c0214cf Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 14 Oct 2008 21:32:50 +0200 Subject: Enforcing lh_config to be run before lh_build, see also http://lists.debian.org/debian-live/2008/10/msg00102.html (Closes: #500740). --- helpers/lh_binary_chroot | 2 +- helpers/lh_binary_debian-installer | 2 +- helpers/lh_binary_disk | 2 +- helpers/lh_binary_encryption | 2 +- helpers/lh_binary_grub | 2 +- helpers/lh_binary_includes | 2 +- helpers/lh_binary_iso | 2 +- helpers/lh_binary_linux-image | 2 +- helpers/lh_binary_local-hooks | 2 +- helpers/lh_binary_local-includes | 2 +- helpers/lh_binary_local-packageslists | 2 +- helpers/lh_binary_manifest | 2 +- helpers/lh_binary_md5sum | 2 +- helpers/lh_binary_memtest | 2 +- helpers/lh_binary_net | 2 +- helpers/lh_binary_rootfs | 2 +- helpers/lh_binary_silo | 2 +- helpers/lh_binary_syslinux | 2 +- helpers/lh_binary_tar | 2 +- helpers/lh_binary_usb-hdd | 2 +- helpers/lh_binary_yaboot | 2 +- helpers/lh_chroot_apt | 2 +- helpers/lh_chroot_debianchroot | 2 +- helpers/lh_chroot_devpts | 2 +- helpers/lh_chroot_dpkg | 2 +- helpers/lh_chroot_hacks | 2 +- helpers/lh_chroot_hooks | 2 +- helpers/lh_chroot_hostname | 2 +- helpers/lh_chroot_hosts | 2 +- helpers/lh_chroot_install-packages | 2 +- helpers/lh_chroot_interactive | 2 +- helpers/lh_chroot_linux-image | 2 +- helpers/lh_chroot_local-hooks | 2 +- helpers/lh_chroot_local-includes | 2 +- helpers/lh_chroot_local-packages | 2 +- helpers/lh_chroot_local-patches | 2 +- helpers/lh_chroot_local-preseed | 2 +- helpers/lh_chroot_localization | 2 +- helpers/lh_chroot_packages | 2 +- helpers/lh_chroot_packageslists | 2 +- helpers/lh_chroot_preseed | 2 +- helpers/lh_chroot_proc | 2 +- helpers/lh_chroot_resolv | 2 +- helpers/lh_chroot_selinuxfs | 2 +- helpers/lh_chroot_sources | 2 +- helpers/lh_chroot_symlinks | 2 +- helpers/lh_chroot_sysfs | 2 +- helpers/lh_chroot_sysv-rc | 2 +- helpers/lh_chroot_sysvinit | 2 +- helpers/lh_chroot_tasks | 2 +- helpers/lh_config | 3 +++ helpers/lh_source_debian | 2 +- helpers/lh_source_debian-live | 2 +- helpers/lh_source_disk | 2 +- helpers/lh_source_iso | 2 +- helpers/lh_source_md5sum | 2 +- helpers/lh_source_net | 2 +- helpers/lh_source_tar | 2 +- helpers/lh_source_usb-hdd | 2 +- 59 files changed, 61 insertions(+), 58 deletions(-) diff --git a/helpers/lh_binary_chroot b/helpers/lh_binary_chroot index 0d596b2..1300f92 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 b352a2a..e536f20 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 7cb707f..ddd2358 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 480c382..cf89574 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 1c9a804..0648552 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 c90e75c..6448c0b 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 0fc09e2..82f4bf5 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 a4a3443..a241e59 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 92c4ea0..96ed5ea 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 dc489ec..d28918c 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 144b1a6..28423a9 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 b5e558a..c731c06 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 14ecaa3..4160107 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 083e477..45e3091 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 9037662..88d530c 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 e48b072..07159e7 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 8bddb2b..7a64f97 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 1763519..529b392 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 8fb5a3a..74ea19d 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 315cf79..2913676 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 189a9f4..e4a442b 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 111adb9..adc6c20 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 29a28db..1baeb81 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 f59e91f..993019f 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 4a13b8d..6c2b86e 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 a202179..f366d8c 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 4e82a9f..800e5d4 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 5d43554..cea01b0 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 3f9ca83..a5ba430 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 e8e0ec1..d68ce10 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 3f22816..b8ebb9d 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 56f4da4..849a4ab 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 0b8cd52..09361da 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 ecb68c7..20d19c9 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 1ea7c73..4ede713 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 7f77675..3d24437 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 e279faa..807bae9 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 4a69e99..f9758f3 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 5ecb484..132d8c4 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 9569550..5a1558c 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 89da6b8..51be962 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 0cb5205..b0b0627 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 51cf734..f678a9a 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 ce19730..c44aea0 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 c3da627..48da344 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 ae6fd27..4763031 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 d78dd50..05c3b8d 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 d4e9352..b82f087 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 fbb35be..6f69169 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 9d3a15b..d3abdf4 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 68e89d6..4ac6353 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 fd98e20..5e391dd 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 488f913..8af129f 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 e61cb4f..2e2bded 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 1538727..688b27a 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 287d2d1..59ab28a 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 f7b6e71..9a4b478 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 386db67..85ba9ab 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 73949e3..b6e70fa 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 -- cgit v1.0