[Debian-live-changes] r1919 - in dists/trunk/live-helper: docs functions helpers

daniel at alioth.debian.org daniel at alioth.debian.org
Sat Jun 2 17:21:22 UTC 2007 

Author: daniel
Date: 2007-06-02 17:21:22 +0000 (Sat, 02 Jun 2007)
New Revision: 1919

Modified:
   dists/trunk/live-helper/docs/ChangeLog
   dists/trunk/live-helper/functions/defaults.sh
   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_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_linux-image
   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_usb-hdd
   dists/trunk/live-helper/helpers/lh_binary_yaboot
   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_build
   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_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_localization
   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_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_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-hdd
   dists/trunk/live-helper/helpers/lh_testroot
   dists/trunk/live-helper/helpers/make-live
Log:


Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/docs/ChangeLog	2007-06-02 17:21:22 UTC (rev 1919)
@@ -1,8 +1,9 @@
 2007-06-02  Daniel Baumann  <daniel at debian.org>
 
 	* Applied patches from Otavio Salvador <otavio at debian.org>:
+	  - Add support to override helpers base directory
+	  - Use LIVE_BOOTSTRAP_CONFIG instead of LIVE_DISTRIBUTION_CONFIG.
 	  - Add support to specify the keyring to be used while bootstraping.
-	  - Use LIVE_BOOTSTRAP_CONFIG instead of LIVE_DISTRIBUTION_CONFIG.
 
 2007-05-28  Daniel Baumann  <daniel at debian.org>
 

Modified: dists/trunk/live-helper/functions/defaults.sh
===================================================================
--- dists/trunk/live-helper/functions/defaults.sh	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/functions/defaults.sh	2007-06-02 17:21:22 UTC (rev 1919)
@@ -232,13 +232,13 @@
 	# Setting includes
 	if [ -z "${LIVE_INCLUDES}" ]
 	then
-		LIVE_INCLUDES="/usr/share/live-helper/includes"
+		LIVE_INCLUDES="${LH_BASE-:/usr/share/live-helper}/includes"
 	fi
 
 	# Setting templates
 	if [ -z "${LIVE_TEMPLATES}" ]
 	then
-		LIVE_TEMPLATES="/usr/share/live-helper/templates"
+		LIVE_TEMPLATES="${LH_BASE-:/usr/share/live-helper}/templates"
 	fi
 
 	# Setting live helper options

Modified: dists/trunk/live-helper/helpers/lh_binary
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_binary	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_binary_chroot
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_chroot	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_binary_chroot	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_binary_debian-installer
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_debian-installer	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_binary_debian-installer	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_binary_encryption
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_encryption	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_binary_encryption	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_binary_grub	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_binary_hdd
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_hdd	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_binary_hdd	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_binary_includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_includes	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_binary_includes	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_binary_iso
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_iso	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_binary_iso	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_binary_linux-image
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_linux-image	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_binary_linux-image	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_binary_local-includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_local-includes	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_binary_local-includes	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_binary_manifest
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_manifest	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_binary_manifest	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_binary_md5sum
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_md5sum	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_binary_md5sum	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_binary_memtest
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_memtest	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_binary_memtest	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_binary_net
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_net	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_binary_net	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_binary_rootfs
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_rootfs	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_binary_rootfs	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_binary_usb-hdd
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_usb-hdd	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_binary_usb-hdd	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_binary_yaboot
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_yaboot	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_binary_yaboot	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_bootstrap
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_bootstrap	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. "${FUNCTION}"
 done

Modified: dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. "${FUNCTION}"
 done

Modified: dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_build
===================================================================
--- dists/trunk/live-helper/helpers/lh_build	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_build	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. "${FUNCTION}"
 done

Modified: dists/trunk/live-helper/helpers/lh_chroot
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_chroot	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_chroot_apt
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_apt	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_chroot_apt	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_chroot_debianchroot
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_debianchroot	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_chroot_debianchroot	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_chroot_hacks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_hacks	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_chroot_hacks	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_chroot_hooks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_hooks	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_chroot_hooks	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done
@@ -47,10 +47,10 @@
 # Processing hooks
 for HOOK in ${LIVE_PACKAGES_LISTS} ${LIVE_TASKS}
 do
-	if [ -f /usr/share/live-helper/hooks/"${HOOK}" ]
+	if [ -f ${LH_BASE-:/usr/share/live-helper}/hooks/"${HOOK}" ]
 	then
 		# Copying hook
-		cp /usr/share/live-helper/hooks/"${HOOK}" chroot/root
+		cp ${LH_BASE-:/usr/share/live-helper}/hooks/"${HOOK}" chroot/root
 
 		# Making hook executable
 		if [ ! -x chroot/root/"${HOOK}" ]

Modified: dists/trunk/live-helper/helpers/lh_chroot_hosts
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_hosts	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_chroot_hosts	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_chroot_interactive
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_interactive	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_chroot_interactive	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_chroot_linux-image
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_linux-image	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_chroot_linux-image	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_chroot_local-hooks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_local-hooks	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_chroot_local-hooks	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_chroot_local-includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_local-includes	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_chroot_local-includes	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_chroot_local-packages
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_local-packages	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_chroot_local-packages	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_chroot_local-packageslists
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_local-packageslists	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_chroot_local-packageslists	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_chroot_localization
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_localization	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_chroot_localization	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_chroot_packages
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_packages	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_chroot_packages	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_chroot_packageslists
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_packageslists	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_chroot_packageslists	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done
@@ -51,10 +51,10 @@
 
 	for LIST in ${LIVE_PACKAGES_LISTS}
 	do
-		if [ -f /usr/share/live-helper/lists/"${LIST}" ]
+		if [ -f ${LH_BASE-:/usr/share/live-helper}/lists/"${LIST}" ]
 		then
 			# Copying package list
-			grep -v "^#" /usr/share/live-helper/lists/"${LIST}" > chroot/root/"${LIST}"
+			grep -v "^#" ${LH_BASE-:/usr/share/live-helper}/lists/"${LIST}" > chroot/root/"${LIST}"
 
 			# Installing package list
 			case "${LH_APT}" in

Modified: dists/trunk/live-helper/helpers/lh_chroot_proc
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_proc	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_chroot_proc	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_chroot_resolv
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_resolv	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_chroot_resolv	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_chroot_sources
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sources	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_chroot_sources	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_chroot_symlinks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_symlinks	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_chroot_symlinks	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_chroot_sysfs
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sysfs	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_chroot_sysfs	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_chroot_sysvinit
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sysvinit	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_chroot_sysvinit	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_chroot_sysvrc
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sysvrc	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_chroot_sysvrc	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_chroot_tasks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_tasks	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_chroot_tasks	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_clean
===================================================================
--- dists/trunk/live-helper/helpers/lh_clean	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_clean	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_config
===================================================================
--- dists/trunk/live-helper/helpers/lh_config	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_config	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done
@@ -26,15 +26,15 @@
 
 if [ -n "${LH_CONFIG}" ]
 then
-	if [ -d /usr/share/live-helper/configs/"${LH_CONFIG}" ]
+	if [ -d ${LH_BASE-:/usr/share/live-helper}/configs/"${LH_CONFIG}" ]
 	then
 		mkdir "${LH_CONFIG}"
-		cp -r /usr/share/live-helper/configs/"${LH_CONFIG}" "${LH_CONFIG}"/config
+		cp -r ${LH_BASE-:/usr/share/live-helper}/configs/"${LH_CONFIG}" "${LH_CONFIG}"/config
 
 		LIVE_ROOT="${LH_CONFIG}"
 		CONFIG=""
 	else
-		Echo_error "Couldn't find config ${LH_CONFIG} in /usr/share/live-helper/configs/."
+		Echo_error "Couldn't find config ${LH_CONFIG} in ${LH_BASE-:/usr/share/live-helper}/configs/."
 	fi
 fi
 

Modified: dists/trunk/live-helper/helpers/lh_losetup
===================================================================
--- dists/trunk/live-helper/helpers/lh_losetup	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_losetup	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_source
===================================================================
--- dists/trunk/live-helper/helpers/lh_source	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_source	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_source_debian
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_debian	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_source_debian	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_source_debian-live
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_debian-live	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_source_debian-live	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_source_generic
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_generic	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_source_generic	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_source_hdd
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_hdd	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_source_hdd	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_source_iso
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_iso	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_source_iso	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_source_md5sum
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_md5sum	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_source_md5sum	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_source_net
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_net	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_source_net	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_source_usb-hdd
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_usb-hdd	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_source_usb-hdd	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/lh_testroot
===================================================================
--- dists/trunk/live-helper/helpers/lh_testroot	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/lh_testroot	2007-06-02 17:21:22 UTC (rev 1919)
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
 	. ${FUNCTION}
 done

Modified: dists/trunk/live-helper/helpers/make-live
===================================================================
--- dists/trunk/live-helper/helpers/make-live	2007-06-02 17:12:34 UTC (rev 1918)
+++ dists/trunk/live-helper/helpers/make-live	2007-06-02 17:21:22 UTC (rev 1919)
@@ -23,7 +23,7 @@
 set -e
 
 # Including common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+for FUNCTION in ${LH_BASE-:/usr/share/live-helper}/functions/*.sh
 do
         . ${FUNCTION}
 done

More information about the Debian-live-changes mailing list