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

2008-10-14 21:32:50 +02:00 · 2008-10-14 21:32:50 +02:00 · 6204dc0e6d
parent 0cbbde2b96
commit 6204dc0e6d
59 changed files with 61 additions and 58 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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)
--- 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)
--- 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)
--- 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)
--- 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
--- 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
--- 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)
--- 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)
--- 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
--- 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
--- 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)
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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)
--- 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)
--- 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)
--- 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"

--- 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
--- 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)
--- 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)
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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