[Debian-live-changes] r949 - dists/trunk/live-helper/helpers

[Daniel Baumann]

Author: daniel
Date: 2007-04-05 21:23:22 +0000 (Thu, 05 Apr 2007)
New Revision: 949

Modified:
   dists/trunk/live-helper/helpers/lh_binary_chroot
   dists/trunk/live-helper/helpers/lh_binary_encryption
   dists/trunk/live-helper/helpers/lh_binary_grub
   dists/trunk/live-helper/helpers/lh_binary_hdd
   dists/trunk/live-helper/helpers/lh_binary_includes
   dists/trunk/live-helper/helpers/lh_binary_iso
   dists/trunk/live-helper/helpers/lh_binary_linuximage
   dists/trunk/live-helper/helpers/lh_binary_localincludes
   dists/trunk/live-helper/helpers/lh_binary_manifest
   dists/trunk/live-helper/helpers/lh_binary_md5sum
   dists/trunk/live-helper/helpers/lh_binary_memtest86
   dists/trunk/live-helper/helpers/lh_binary_net
   dists/trunk/live-helper/helpers/lh_binary_rootfs
   dists/trunk/live-helper/helpers/lh_binary_syslinux
   dists/trunk/live-helper/helpers/lh_binary_usb
   dists/trunk/live-helper/helpers/lh_bootstrap
   dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap
   dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap
   dists/trunk/live-helper/helpers/lh_chroot
   dists/trunk/live-helper/helpers/lh_chroot_apt
   dists/trunk/live-helper/helpers/lh_chroot_debianchroot
   dists/trunk/live-helper/helpers/lh_chroot_hacks
   dists/trunk/live-helper/helpers/lh_chroot_hooks
   dists/trunk/live-helper/helpers/lh_chroot_hosts
   dists/trunk/live-helper/helpers/lh_chroot_interactive
   dists/trunk/live-helper/helpers/lh_chroot_linuximage
   dists/trunk/live-helper/helpers/lh_chroot_localhooks
   dists/trunk/live-helper/helpers/lh_chroot_localincludes
   dists/trunk/live-helper/helpers/lh_chroot_localization
   dists/trunk/live-helper/helpers/lh_chroot_localpackages
   dists/trunk/live-helper/helpers/lh_chroot_localpackageslists
   dists/trunk/live-helper/helpers/lh_chroot_packages
   dists/trunk/live-helper/helpers/lh_chroot_packageslists
   dists/trunk/live-helper/helpers/lh_chroot_proc
   dists/trunk/live-helper/helpers/lh_chroot_resolv
   dists/trunk/live-helper/helpers/lh_chroot_sources
   dists/trunk/live-helper/helpers/lh_chroot_symlinks
   dists/trunk/live-helper/helpers/lh_chroot_sysfs
   dists/trunk/live-helper/helpers/lh_chroot_sysvinit
   dists/trunk/live-helper/helpers/lh_chroot_sysvrc
   dists/trunk/live-helper/helpers/lh_chroot_tasks
   dists/trunk/live-helper/helpers/lh_clean
   dists/trunk/live-helper/helpers/lh_losetup
   dists/trunk/live-helper/helpers/lh_source
   dists/trunk/live-helper/helpers/lh_source_config
   dists/trunk/live-helper/helpers/lh_source_download
   dists/trunk/live-helper/helpers/lh_source_generic
   dists/trunk/live-helper/helpers/lh_source_hdd
   dists/trunk/live-helper/helpers/lh_source_iso
   dists/trunk/live-helper/helpers/lh_source_md5sum
   dists/trunk/live-helper/helpers/lh_source_net
   dists/trunk/live-helper/helpers/lh_source_usb
Log:


Modified: dists/trunk/live-helper/helpers/lh_binary_chroot
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_chroot	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_binary_chroot	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,7 +23,10 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
+Read_conffile config/image
 Set_defaults
 
 # Requiring stage file

Modified: dists/trunk/live-helper/helpers/lh_binary_encryption
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_encryption	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_binary_encryption	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,6 +23,8 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
 Read_conffile config/image
 Set_defaults

Modified: dists/trunk/live-helper/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_binary_grub	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,9 +23,9 @@
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/common
 Read_conffile config/bootstrap
 Read_conffile config/chroot
+Read_conffile config/common
 Read_conffile config/image
 Set_defaults
 

Modified: dists/trunk/live-helper/helpers/lh_binary_hdd
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_hdd	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_binary_hdd	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,8 +23,9 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
-Read_conffile config/bootstrap
 Read_conffile config/image
 Set_defaults
 

Modified: dists/trunk/live-helper/helpers/lh_binary_includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_includes	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_binary_includes	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,8 +23,9 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
-Read_conffile config/chroot
 Read_conffile config/image
 Set_defaults
 

Modified: dists/trunk/live-helper/helpers/lh_binary_iso
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_iso	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_binary_iso	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,8 +23,9 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
-Read_conffile config/bootstrap
 Read_conffile config/image
 Set_defaults
 

Modified: dists/trunk/live-helper/helpers/lh_binary_linuximage
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_linuximage	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_binary_linuximage	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,9 +23,9 @@
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/common
 Read_conffile config/bootstrap
 Read_conffile config/chroot
+Read_conffile config/common
 Read_conffile config/image
 Set_defaults
 

Modified: dists/trunk/live-helper/helpers/lh_binary_localincludes
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_localincludes	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_binary_localincludes	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,8 +23,10 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
-Read_conffile config/chroot
+Read_conffile config/image
 Set_defaults
 
 # Requiring stage file

Modified: dists/trunk/live-helper/helpers/lh_binary_manifest
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_manifest	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_binary_manifest	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,6 +23,8 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
 Read_conffile config/image
 Set_defaults

Modified: dists/trunk/live-helper/helpers/lh_binary_md5sum
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_md5sum	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_binary_md5sum	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,6 +23,8 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
 Read_conffile config/image
 Set_defaults

Modified: dists/trunk/live-helper/helpers/lh_binary_memtest86
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_memtest86	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_binary_memtest86	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,9 +23,9 @@
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/common
 Read_conffile config/bootstrap
 Read_conffile config/chroot
+Read_conffile config/common
 Read_conffile config/image
 Set_defaults
 

Modified: dists/trunk/live-helper/helpers/lh_binary_net
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_net	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_binary_net	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,8 +23,9 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
-Read_conffile config/bootstrap
 Read_conffile config/image
 Set_defaults
 

Modified: dists/trunk/live-helper/helpers/lh_binary_rootfs
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_rootfs	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_binary_rootfs	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,6 +23,8 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
 Read_conffile config/image
 Set_defaults

Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,9 +23,9 @@
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/common
 Read_conffile config/bootstrap
 Read_conffile config/chroot
+Read_conffile config/common
 Read_conffile config/image
 Set_defaults
 

Modified: dists/trunk/live-helper/helpers/lh_binary_usb
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_usb	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_binary_usb	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,8 +23,9 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
-Read_conffile config/bootstrap
 Read_conffile config/image
 Set_defaults
 

Modified: dists/trunk/live-helper/helpers/lh_bootstrap
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_bootstrap	2007-04-05 21:23:22 UTC (rev 949)
@@ -26,7 +26,10 @@
 Echo_debug "Init ${PROGRAM}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
+Read_conffile config/image
 Set_defaults
 
 # Bootstrapping system

Modified: dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap	2007-04-05 21:23:22 UTC (rev 949)
@@ -29,8 +29,10 @@
 Echo_debug "Init ${PROGRAM}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
-Read_conffile config/bootstrap
+Read_conffile config/image
 Set_defaults
 
 if [ "${LH_BOOTSTRAP}" != "cdebootstrap" ]

Modified: dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap	2007-04-05 21:23:22 UTC (rev 949)
@@ -29,8 +29,10 @@
 Echo_debug "Init ${PROGRAM}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
-Read_conffile config/bootstrap
+Read_conffile config/image
 Set_defaults
 
 if [ "${LH_BOOTSTRAP}" != "debootstrap" ]

Modified: dists/trunk/live-helper/helpers/lh_chroot
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_chroot	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,8 +23,10 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
-Read_conffile config/chroot
+Read_conffile config/image
 Set_defaults
 
 # Configuring chroot

Modified: dists/trunk/live-helper/helpers/lh_chroot_apt
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_apt	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_chroot_apt	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,8 +23,10 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
-Read_conffile config/chroot
+Read_conffile config/image
 Set_defaults
 
 # Requiring stage file

Modified: dists/trunk/live-helper/helpers/lh_chroot_debianchroot
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_debianchroot	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_chroot_debianchroot	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,8 +23,10 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
-Read_conffile config/chroot
+Read_conffile config/image
 Set_defaults
 
 # Requiring stage file

Modified: dists/trunk/live-helper/helpers/lh_chroot_hacks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_hacks	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_chroot_hacks	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,8 +23,10 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
-Read_conffile config/chroot
+Read_conffile config/image
 Set_defaults
 
 # Requiring stage file

Modified: dists/trunk/live-helper/helpers/lh_chroot_hooks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_hooks	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_chroot_hooks	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,8 +23,10 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
-Read_conffile config/chroot
+Read_conffile config/image
 Set_defaults
 
 # Requiring stage file

Modified: dists/trunk/live-helper/helpers/lh_chroot_hosts
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_hosts	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_chroot_hosts	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,8 +23,10 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
-Read_conffile config/chroot
+Read_conffile config/image
 Set_defaults
 
 # Requiring stage file

Modified: dists/trunk/live-helper/helpers/lh_chroot_interactive
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_interactive	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_chroot_interactive	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,8 +23,10 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
-Read_conffile config/chroot
+Read_conffile config/image
 Set_defaults
 
 if [ "${LIVE_INTERACTIVE}" != "disabled" ]

Modified: dists/trunk/live-helper/helpers/lh_chroot_linuximage
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_linuximage	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_chroot_linuximage	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,8 +23,10 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
-Read_conffile config/chroot
+Read_conffile config/image
 Set_defaults
 
 # Requiring stage file

Modified: dists/trunk/live-helper/helpers/lh_chroot_localhooks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_localhooks	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_chroot_localhooks	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,8 +23,10 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
-Read_conffile config/chroot
+Read_conffile config/image
 Set_defaults
 
 # Requiring stage file

Modified: dists/trunk/live-helper/helpers/lh_chroot_localincludes
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_localincludes	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_chroot_localincludes	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,8 +23,10 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
-Read_conffile config/chroot
+Read_conffile config/image
 Set_defaults
 
 # Requiring stage file

Modified: dists/trunk/live-helper/helpers/lh_chroot_localization
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_localization	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_chroot_localization	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,8 +23,10 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
-Read_conffile config/chroot
+Read_conffile config/image
 Set_defaults
 
 # Requiring stage file

Modified: dists/trunk/live-helper/helpers/lh_chroot_localpackages
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_localpackages	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_chroot_localpackages	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,8 +23,10 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
-Read_conffile config/chroot
+Read_conffile config/image
 Set_defaults
 
 # Requiring stage file

Modified: dists/trunk/live-helper/helpers/lh_chroot_localpackageslists
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_localpackageslists	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_chroot_localpackageslists	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,8 +23,10 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
-Read_conffile config/chroot
+Read_conffile config/image
 Set_defaults
 
 # Requiring stage file

Modified: dists/trunk/live-helper/helpers/lh_chroot_packages
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_packages	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_chroot_packages	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,9 +23,10 @@
 Arguments "${@}"
 
 # Reading configuration files
-Read_conffile config/common
 Read_conffile config/bootstrap
 Read_conffile config/chroot
+Read_conffile config/common
+Read_conffile config/image
 Set_defaults
 
 # Requiring stage file

Modified: dists/trunk/live-helper/helpers/lh_chroot_packageslists
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_packageslists	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_chroot_packageslists	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,8 +23,10 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
-Read_conffile config/chroot
+Read_conffile config/image
 Set_defaults
 
 # Requiring stage file

Modified: dists/trunk/live-helper/helpers/lh_chroot_proc
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_proc	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_chroot_proc	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,8 +23,10 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
-Read_conffile config/chroot
+Read_conffile config/image
 Set_defaults
 
 # Requiring stage file

Modified: dists/trunk/live-helper/helpers/lh_chroot_resolv
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_resolv	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_chroot_resolv	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,8 +23,10 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
-Read_conffile config/chroot
+Read_conffile config/image
 Set_defaults
 
 # Requiring stage file

Modified: dists/trunk/live-helper/helpers/lh_chroot_sources
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sources	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_chroot_sources	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,9 +23,9 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
-Read_conffile config/chroot
-Read_conffile config/bootstrap #FIXME
 Read_conffile config/image
 Set_defaults
 

Modified: dists/trunk/live-helper/helpers/lh_chroot_symlinks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_symlinks	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_chroot_symlinks	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,8 +23,10 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
-Read_conffile config/chroot
+Read_conffile config/image
 Set_defaults
 
 # Requiring stage file

Modified: dists/trunk/live-helper/helpers/lh_chroot_sysfs
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sysfs	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_chroot_sysfs	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,8 +23,10 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
-Read_conffile config/chroot
+Read_conffile config/image
 Set_defaults
 
 # Requiring stage file

Modified: dists/trunk/live-helper/helpers/lh_chroot_sysvinit
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sysvinit	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_chroot_sysvinit	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,8 +23,10 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
-Read_conffile config/chroot
+Read_conffile config/image
 Set_defaults
 
 # Requiring stage file

Modified: dists/trunk/live-helper/helpers/lh_chroot_sysvrc
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sysvrc	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_chroot_sysvrc	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,8 +23,10 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
-Read_conffile config/chroot
+Read_conffile config/image
 Set_defaults
 
 # Requiring stage file

Modified: dists/trunk/live-helper/helpers/lh_chroot_tasks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_tasks	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_chroot_tasks	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,8 +23,10 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
-Read_conffile config/chroot
+Read_conffile config/image
 Set_defaults
 
 # Requiring stage file

Modified: dists/trunk/live-helper/helpers/lh_clean
===================================================================
--- dists/trunk/live-helper/helpers/lh_clean	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_clean	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,7 +23,10 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
+Read_conffile config/image
 Set_defaults
 
 case "${1}" in

Modified: dists/trunk/live-helper/helpers/lh_losetup
===================================================================
--- dists/trunk/live-helper/helpers/lh_losetup	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_losetup	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,7 +23,10 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
+Read_conffile config/image
 Set_defaults
 
 if [ -z "${1}" ]

Modified: dists/trunk/live-helper/helpers/lh_source
===================================================================
--- dists/trunk/live-helper/helpers/lh_source	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_source	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,6 +23,8 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
 Read_conffile config/image
 Set_defaults

Modified: dists/trunk/live-helper/helpers/lh_source_config
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_config	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_source_config	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,6 +23,8 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
 Read_conffile config/image
 Set_defaults

Modified: dists/trunk/live-helper/helpers/lh_source_download
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_download	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_source_download	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,6 +23,8 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
 Read_conffile config/image
 Set_defaults

Modified: dists/trunk/live-helper/helpers/lh_source_generic
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_generic	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_source_generic	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,6 +23,8 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
 Read_conffile config/image
 Set_defaults

Modified: dists/trunk/live-helper/helpers/lh_source_hdd
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_hdd	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_source_hdd	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,6 +23,8 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
 Read_conffile config/image
 Set_defaults

Modified: dists/trunk/live-helper/helpers/lh_source_iso
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_iso	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_source_iso	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,6 +23,8 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
 Read_conffile config/image
 Set_defaults

Modified: dists/trunk/live-helper/helpers/lh_source_md5sum
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_md5sum	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_source_md5sum	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,6 +23,8 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
 Read_conffile config/image
 Set_defaults

Modified: dists/trunk/live-helper/helpers/lh_source_net
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_net	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_source_net	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,6 +23,8 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
 Read_conffile config/image
 Set_defaults

Modified: dists/trunk/live-helper/helpers/lh_source_usb
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_usb	2007-04-05 21:12:20 UTC (rev 948)
+++ dists/trunk/live-helper/helpers/lh_source_usb	2007-04-05 21:23:22 UTC (rev 949)
@@ -23,8 +23,9 @@
 Arguments "${@}"
 
 # Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
 Read_conffile config/common
-Read_conffile config/bootstrap
 Read_conffile config/image
 Set_defaults