r2759 - in dists/trunk/live-helper: docs helpers manpages

daniel at alioth.debian.org daniel at alioth.debian.org
Tue Aug 14 08:12:18 UTC 2007 

Author: daniel
Date: 2007-08-14 08:12:17 +0000 (Tue, 14 Aug 2007)
New Revision: 2759

Modified:
   dists/trunk/live-helper/docs/ChangeLog
   dists/trunk/live-helper/helpers/lh_binary
   dists/trunk/live-helper/helpers/lh_binary_chroot
   dists/trunk/live-helper/helpers/lh_binary_debian-installer
   dists/trunk/live-helper/helpers/lh_binary_disk
   dists/trunk/live-helper/helpers/lh_binary_encryption
   dists/trunk/live-helper/helpers/lh_binary_grub
   dists/trunk/live-helper/helpers/lh_binary_includes
   dists/trunk/live-helper/helpers/lh_binary_iso
   dists/trunk/live-helper/helpers/lh_binary_linux-image
   dists/trunk/live-helper/helpers/lh_binary_local-hooks
   dists/trunk/live-helper/helpers/lh_binary_local-includes
   dists/trunk/live-helper/helpers/lh_binary_manifest
   dists/trunk/live-helper/helpers/lh_binary_md5sum
   dists/trunk/live-helper/helpers/lh_binary_memtest
   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_tar
   dists/trunk/live-helper/helpers/lh_binary_usb-hdd
   dists/trunk/live-helper/helpers/lh_binary_yaboot
   dists/trunk/live-helper/helpers/lh_bootstrap
   dists/trunk/live-helper/helpers/lh_bootstrap_cache
   dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap
   dists/trunk/live-helper/helpers/lh_bootstrap_copy
   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_cache
   dists/trunk/live-helper/helpers/lh_chroot_debianchroot
   dists/trunk/live-helper/helpers/lh_chroot_dpkg
   dists/trunk/live-helper/helpers/lh_chroot_hacks
   dists/trunk/live-helper/helpers/lh_chroot_hooks
   dists/trunk/live-helper/helpers/lh_chroot_hostname
   dists/trunk/live-helper/helpers/lh_chroot_hosts
   dists/trunk/live-helper/helpers/lh_chroot_interactive
   dists/trunk/live-helper/helpers/lh_chroot_linux-image
   dists/trunk/live-helper/helpers/lh_chroot_local-hooks
   dists/trunk/live-helper/helpers/lh_chroot_local-includes
   dists/trunk/live-helper/helpers/lh_chroot_local-packages
   dists/trunk/live-helper/helpers/lh_chroot_local-packageslists
   dists/trunk/live-helper/helpers/lh_chroot_local-preseed
   dists/trunk/live-helper/helpers/lh_chroot_localization
   dists/trunk/live-helper/helpers/lh_chroot_packages
   dists/trunk/live-helper/helpers/lh_chroot_packageslists
   dists/trunk/live-helper/helpers/lh_chroot_preseed
   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_sysv-rc
   dists/trunk/live-helper/helpers/lh_chroot_sysvinit
   dists/trunk/live-helper/helpers/lh_chroot_tasks
   dists/trunk/live-helper/helpers/lh_clean
   dists/trunk/live-helper/helpers/lh_config
   dists/trunk/live-helper/helpers/lh_losetup
   dists/trunk/live-helper/helpers/lh_source
   dists/trunk/live-helper/helpers/lh_source_debian
   dists/trunk/live-helper/helpers/lh_source_debian-live
   dists/trunk/live-helper/helpers/lh_source_disk
   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_tar
   dists/trunk/live-helper/helpers/lh_source_usb-hdd
   dists/trunk/live-helper/helpers/lh_testroot
   dists/trunk/live-helper/manpages/live-helper.de.7
   dists/trunk/live-helper/manpages/live-helper.en.7
Log:


Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/docs/ChangeLog	2007-08-14 08:12:17 UTC (rev 2759)
@@ -1,3 +1,8 @@
+2007-08-14  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/*:
+	  - Added --conffile to all helpers.
+
 2007-08-13  Daniel Baumann  <daniel at debian.org>
 
 	* helpers/lh_binary_memtest:

Modified: dists/trunk/live-helper/helpers/lh_binary
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_binary	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 # Preparing root filesystem

Modified: dists/trunk/live-helper/helpers/lh_binary_chroot
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_chroot	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_binary_chroot	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 Echo_message "Begin copying chroot..."

Modified: dists/trunk/live-helper/helpers/lh_binary_debian-installer
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_debian-installer	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_binary_debian-installer	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 # Setting remote d-i directories

Modified: dists/trunk/live-helper/helpers/lh_binary_disk
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_disk	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_binary_disk	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 if [ "${LH_BINARY_IMAGES}" != "iso" ]

Modified: dists/trunk/live-helper/helpers/lh_binary_encryption
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_encryption	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_binary_encryption	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 if [ -z "${LH_ENCRYPTION}" ]

Modified: dists/trunk/live-helper/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_binary_grub	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 if [ "${LH_BOOTLOADER}" != "grub" ]

Modified: dists/trunk/live-helper/helpers/lh_binary_includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_includes	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_binary_includes	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 if [ "${LH_INCLUDES}" = "none" ]

Modified: dists/trunk/live-helper/helpers/lh_binary_iso
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_iso	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_binary_iso	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 if ! echo "${LH_BINARY_IMAGES}" | grep -qs iso

Modified: dists/trunk/live-helper/helpers/lh_binary_linux-image
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_linux-image	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_binary_linux-image	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 Echo_message "Begin install linux-image..."

Modified: dists/trunk/live-helper/helpers/lh_binary_local-hooks
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_local-hooks	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_binary_local-hooks	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 Echo_message "Begin executing local hooks..."

Modified: dists/trunk/live-helper/helpers/lh_binary_local-includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_local-includes	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_binary_local-includes	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 Echo_message "Begin copying binary local includes..."

Modified: dists/trunk/live-helper/helpers/lh_binary_manifest
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_manifest	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_binary_manifest	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 Echo_message "Begin creating manifest..."

Modified: dists/trunk/live-helper/helpers/lh_binary_md5sum
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_md5sum	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_binary_md5sum	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 Echo_message "Begin creating binary md5sum.txt..."

Modified: dists/trunk/live-helper/helpers/lh_binary_memtest
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_memtest	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_binary_memtest	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 if [ "${LH_MEMTEST}" = "disabled" ]

Modified: dists/trunk/live-helper/helpers/lh_binary_net
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_net	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_binary_net	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 if ! echo "${LH_BINARY_IMAGES}" | grep -qs net

Modified: dists/trunk/live-helper/helpers/lh_binary_rootfs
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_rootfs	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_binary_rootfs	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 Echo_message "Begin building root filesystem image..."

Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 if [ "${LH_BOOTLOADER}" != "syslinux" ]

Modified: dists/trunk/live-helper/helpers/lh_binary_tar
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_tar	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_binary_tar	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 if ! echo "${LH_BINARY_IMAGES}" | grep -qs tar

Modified: dists/trunk/live-helper/helpers/lh_binary_usb-hdd
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_usb-hdd	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_binary_usb-hdd	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 if ! echo "${LH_BINARY_IMAGES}" | grep -qs usb-hdd

Modified: dists/trunk/live-helper/helpers/lh_binary_yaboot
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_yaboot	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_binary_yaboot	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 if [ "${LH_BOOTLOADER}" != "yaboot" ]

Modified: dists/trunk/live-helper/helpers/lh_bootstrap
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_bootstrap	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 # Bootstrapping system

Modified: dists/trunk/live-helper/helpers/lh_bootstrap_cache
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap_cache	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_bootstrap_cache	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 Echo_message "Begin caching bootstrap stage..."

Modified: dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 if [ "${LH_BOOTSTRAP}" != "cdebootstrap" ]

Modified: dists/trunk/live-helper/helpers/lh_bootstrap_copy
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap_copy	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_bootstrap_copy	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 if [ "${LH_BOOTSTRAP}" != "copy" ]

Modified: dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 if [ "${LH_BOOTSTRAP}" != "debootstrap" ]

Modified: dists/trunk/live-helper/helpers/lh_chroot
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_chroot	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 # Configuring chroot

Modified: dists/trunk/live-helper/helpers/lh_chroot_apt
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_apt	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_chroot_apt	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 # Requiring stage file

Modified: dists/trunk/live-helper/helpers/lh_chroot_cache
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_cache	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_chroot_cache	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 Echo_message "Begin caching chroot stage..."

Modified: dists/trunk/live-helper/helpers/lh_chroot_debianchroot
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_debianchroot	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_chroot_debianchroot	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 # Requiring stage file

Modified: dists/trunk/live-helper/helpers/lh_chroot_dpkg
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_dpkg	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_chroot_dpkg	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 # Requiring stage file

Modified: dists/trunk/live-helper/helpers/lh_chroot_hacks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_hacks	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_chroot_hacks	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 Echo_message "Begin executing hacks..."

Modified: dists/trunk/live-helper/helpers/lh_chroot_hooks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_hooks	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_chroot_hooks	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 Echo_message "Begin executing hooks..."

Modified: dists/trunk/live-helper/helpers/lh_chroot_hostname
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_hostname	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_chroot_hostname	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 # Requiring stage file

Modified: dists/trunk/live-helper/helpers/lh_chroot_hosts
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_hosts	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_chroot_hosts	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 # Requiring stage file

Modified: dists/trunk/live-helper/helpers/lh_chroot_interactive
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_interactive	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_chroot_interactive	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 if [ "${LH_INTERACTIVE}" = "disabled" ]

Modified: dists/trunk/live-helper/helpers/lh_chroot_linux-image
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_linux-image	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_chroot_linux-image	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 # Requiring stage file

Modified: dists/trunk/live-helper/helpers/lh_chroot_local-hooks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_local-hooks	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_chroot_local-hooks	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 Echo_message "Begin executing local hooks..."

Modified: dists/trunk/live-helper/helpers/lh_chroot_local-includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_local-includes	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_chroot_local-includes	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 Echo_message "Begin copying chroot local includes..."

Modified: dists/trunk/live-helper/helpers/lh_chroot_local-packages
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_local-packages	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_chroot_local-packages	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 Echo_message "Begin installing local packages..."

Modified: dists/trunk/live-helper/helpers/lh_chroot_local-packageslists
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_local-packageslists	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_chroot_local-packageslists	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 Echo_message "Begin installing local packages lists..."

Modified: dists/trunk/live-helper/helpers/lh_chroot_local-preseed
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_local-preseed	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_chroot_local-preseed	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 Echo_message "Begin executing locale preseed..."

Modified: dists/trunk/live-helper/helpers/lh_chroot_localization
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_localization	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_chroot_localization	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 Echo_message "Begin installing localization packages..."

Modified: dists/trunk/live-helper/helpers/lh_chroot_packages
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_packages	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_chroot_packages	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 Echo_message "Begin installing packages..."

Modified: dists/trunk/live-helper/helpers/lh_chroot_packageslists
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_packageslists	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_chroot_packageslists	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 Echo_message "Begin installing packages lists..."

Modified: dists/trunk/live-helper/helpers/lh_chroot_preseed
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_preseed	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_chroot_preseed	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 Echo_message "Begin executing preseed..."

Modified: dists/trunk/live-helper/helpers/lh_chroot_proc
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_proc	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_chroot_proc	2007-08-14 08:12:17 UTC (rev 2759)
@@ -33,6 +33,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 Echo_message "Begin mounting /proc..."

Modified: dists/trunk/live-helper/helpers/lh_chroot_resolv
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_resolv	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_chroot_resolv	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 # Requiring stage file

Modified: dists/trunk/live-helper/helpers/lh_chroot_sources
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sources	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_chroot_sources	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 # Requiring stage file

Modified: dists/trunk/live-helper/helpers/lh_chroot_symlinks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_symlinks	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_chroot_symlinks	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 if [ "${LH_SYMLINKS}" != "enabled" ]

Modified: dists/trunk/live-helper/helpers/lh_chroot_sysfs
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sysfs	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_chroot_sysfs	2007-08-14 08:12:17 UTC (rev 2759)
@@ -33,6 +33,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 Echo_message "Begin mounting /sys..."

Modified: dists/trunk/live-helper/helpers/lh_chroot_sysv-rc
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sysv-rc	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_chroot_sysv-rc	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 # Requiring stage file

Modified: dists/trunk/live-helper/helpers/lh_chroot_sysvinit
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sysvinit	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_chroot_sysvinit	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 Echo_message "Configuring package sysvinit"

Modified: dists/trunk/live-helper/helpers/lh_chroot_tasks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_tasks	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_chroot_tasks	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 Echo_message "Begin installing tasks..."

Modified: dists/trunk/live-helper/helpers/lh_clean
===================================================================
--- dists/trunk/live-helper/helpers/lh_clean	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_clean	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 rm -f .lock

Modified: dists/trunk/live-helper/helpers/lh_config
===================================================================
--- dists/trunk/live-helper/helpers/lh_config	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_config	2007-08-14 08:12:17 UTC (rev 2759)
@@ -487,6 +487,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 
 # Setting defaults
 Set_defaults

Modified: dists/trunk/live-helper/helpers/lh_losetup
===================================================================
--- dists/trunk/live-helper/helpers/lh_losetup	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_losetup	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 DEVICE="${1}"

Modified: dists/trunk/live-helper/helpers/lh_source
===================================================================
--- dists/trunk/live-helper/helpers/lh_source	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_source	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 # Enabling network in chroot

Modified: dists/trunk/live-helper/helpers/lh_source_debian
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_debian	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_source_debian	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 if [ "${LH_SOURCE}" != "enabled" ]

Modified: dists/trunk/live-helper/helpers/lh_source_debian-live
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_debian-live	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_source_debian-live	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 if [ "${LH_SOURCE}" != "enabled" ]

Modified: dists/trunk/live-helper/helpers/lh_source_disk
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_disk	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_source_disk	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 if [ "${LH_SOURCE_IMAGES}" != "iso" ]

Modified: dists/trunk/live-helper/helpers/lh_source_iso
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_iso	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_source_iso	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 if [ "${LH_SOURCE}" != "enabled" ]

Modified: dists/trunk/live-helper/helpers/lh_source_md5sum
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_md5sum	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_source_md5sum	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 if [ "${LH_SOURCE}" != "enabled" ]

Modified: dists/trunk/live-helper/helpers/lh_source_net
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_net	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_source_net	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 if [ "${LH_SOURCE}" != "enabled" ]

Modified: dists/trunk/live-helper/helpers/lh_source_tar
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_tar	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_source_tar	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 if [ "${LH_SOURCE}" != "enabled" ]

Modified: dists/trunk/live-helper/helpers/lh_source_usb-hdd
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_usb-hdd	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_source_usb-hdd	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 if [ "${LH_SOURCE}" != "enabled" ]

Modified: dists/trunk/live-helper/helpers/lh_testroot
===================================================================
--- dists/trunk/live-helper/helpers/lh_testroot	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/helpers/lh_testroot	2007-08-14 08:12:17 UTC (rev 2759)
@@ -30,6 +30,7 @@
 Read_conffile config/chroot
 Read_conffile config/binary
 Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
 Set_defaults
 
 # Checking user account

Modified: dists/trunk/live-helper/manpages/live-helper.de.7
===================================================================
--- dists/trunk/live-helper/manpages/live-helper.de.7	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/manpages/live-helper.de.7	2007-08-14 08:12:17 UTC (rev 2759)
@@ -150,8 +150,6 @@
 erzwingt Helper Ausf\[:u]hrung, auch wenn Stage-Datei existiert.
 .IP "\fB\-h, \-\-help\fR" 4
 zeigt Hilfe Informationen und stoppt.
-.IP "\fB\-\-logfile\fR" 4
-benutzen von eigener Log-Datei.
 .IP "\fB\-\-quiet\fR" 4
 still
 .IP "\fB\-u, \-\-usage\fR" 4

Modified: dists/trunk/live-helper/manpages/live-helper.en.7
===================================================================
--- dists/trunk/live-helper/manpages/live-helper.en.7	2007-08-13 22:41:47 UTC (rev 2758)
+++ dists/trunk/live-helper/manpages/live-helper.en.7	2007-08-14 08:12:17 UTC (rev 2759)
@@ -148,8 +148,6 @@
 force helper execution, even if stage file exists.
 .IP "\fB\-h, \-\-help\fR" 4
 display help and exit
-.IP "\fB\-\-logfile\fR" 4
-use custom log file
 .IP "\fB\-\-quiet\fR" 4
 be quiet
 .IP "\fB\-u, \-\-usage\fR" 4

More information about the debian-live-changes mailing list