Adding live-helper 1.0~a22-1.

6 files changed, 63 insertions, 18 deletions

diff --git a/examples/cron/etch.sh b/examples/cron/etch.sh
index 49c62b7ae..3b9842c60 100755
--- a/examples/cron/etch.sh
+++ b/examples/cron/etch.sh
@@ -19,11 +19,11 @@ MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
 MIRROR_BOOTSTRAP_SECURITY="http://ftp.de.debian.org/debian-security/"
 MIRROR_BINARY="http://ftp.debian.org/debian/"
 MIRROR_BINARY_SECURITY="http://security.debian.org/"
-PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop"
+PACKAGES_LISTS="standard rescue gnome-desktop kde-desktop xfce-desktop"
 # End custom defaults
 
 # Checking for live-helper availability
-if [ ! -x /usr/bin/make-live ]
+if [ ! -x /usr/bin/lh_config ]
 then
 	exit 0
 fi
@@ -66,11 +66,12 @@ do
 				# Creating build directory
 				mkdir -p "${TEMPDIR}"/debian-live
 
-				cd "${TEMPDIR}"
+				cd "${TEMPDIR}"/debian-live
 				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
 
 				# Generating images
-				make-live -b iso -s tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
+				lh_config --binary-images iso --source-images tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS}
+				lh_build >> "${TEMPDIR}"/debian-live/log.txt 2>&1
 
 				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
 			fi
@@ -106,11 +107,12 @@ do
 				# Creating build directory
 				mkdir -p "${TEMPDIR}"/debian-live
 
-				cd "${TEMPDIR}"
+				cd "${TEMPDIR}"/debian-live
 				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
 
 				# Generating images
-				make-live -b usb-hdd -s tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
+				lh_config --binary-images usb-hdd --source-images tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS}
+				lh_build >> "${TEMPDIR}"/debian-live/log.txt 2>&1
 
 				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
 			fi
diff --git a/examples/cron/lenny.sh b/examples/cron/lenny.sh
index 10cef516b..cdec0d1d4 100755
--- a/examples/cron/lenny.sh
+++ b/examples/cron/lenny.sh
@@ -19,11 +19,11 @@ MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
 MIRROR_BOOTSTRAP_SECURITY="http://ftp.de.debian.org/debian-security/"
 MIRROR_BINARY="http://ftp.debian.org/debian/"
 MIRROR_BINARY_SECURITY="http://security.debian.org/"
-PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop"
+PACKAGES_LISTS="standard rescue gnome-desktop kde-desktop xfce-desktop"
 # End custom defaults
 
 # Checking for live-helper availability
-if [ ! -x /usr/bin/make-live ]
+if [ ! -x /usr/bin/lh_config ]
 then
 	exit 0
 fi
@@ -66,11 +66,12 @@ do
 				# Creating build directory
 				mkdir -p "${TEMPDIR}"/debian-live
 
-				cd "${TEMPDIR}"
+				cd "${TEMPDIR}"/debian-live
 				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
 
 				# Generating images
-				make-live -b iso -s tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
+				lh_config --binary-images iso --source-images tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS}
+				lh_build >> "${TEMPDIR}"/debian-live/log.txt 2>&1
 
 				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
 			fi
@@ -106,11 +107,12 @@ do
 				# Creating build directory
 				mkdir -p "${TEMPDIR}"/debian-live
 
-				cd "${TEMPDIR}"
+				cd "${TEMPDIR}"/debian-live
 				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
 
 				# Generating images
-				make-live -b usb-hdd -s tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
+				lh_config --binary-images usb-hdd --source-images tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS}
+				lh_build >> "${TEMPDIR}"/debian-live/log.txt 2>&1
 
 				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
 			fi
diff --git a/examples/cron/sid.sh b/examples/cron/sid.sh
index 7769fef7d..406892241 100755
--- a/examples/cron/sid.sh
+++ b/examples/cron/sid.sh
@@ -19,11 +19,11 @@ MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
 MIRROR_BOOTSTRAP_SECURITY="http://ftp.de.debian.org/debian-security/"
 MIRROR_BINARY="http://ftp.debian.org/debian/"
 MIRROR_BINARY_SECURITY="http://security.debian.org/"
-PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop"
+PACKAGES_LISTS="standard rescue gnome-desktop kde-desktop xfce-desktop"
 # End custom defaults
 
 # Checking for live-helper availability
-if [ ! -x /usr/bin/make-live ]
+if [ ! -x /usr/bin/lh_config ]
 then
 	exit 0
 fi
@@ -66,11 +66,12 @@ do
 				# Creating build directory
 				mkdir -p "${TEMPDIR}"/debian-live
 
-				cd "${TEMPDIR}"
+				cd "${TEMPDIR}"/debian-live
 				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
 
 				# Generating images
-				make-live -b iso -s tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
+				lh_config --binary-images iso --source-images tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS}
+				lh_build >> "${TEMPDIR}"/debian-live/log.txt 2>&1
 
 				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
 			fi
@@ -106,11 +107,12 @@ do
 				# Creating build directory
 				mkdir -p "${TEMPDIR}"/debian-live
 
-				cd "${TEMPDIR}"
+				cd "${TEMPDIR}"/debian-live
 				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
 
 				# Generating images
-				make-live -b usb-hdd -s tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
+				lh_config --binary-images usb-hdd --source-images tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS}
+				lh_build >> "${TEMPDIR}"/debian-live/log.txt 2>&1
 
 				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
 			fi
diff --git a/examples/hooks/aufs.sh b/examples/hooks/aufs.sh
new file mode 100755
index 000000000..ca637af1a
--- /dev/null
+++ b/examples/hooks/aufs.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# This is a hook for live-helper(7) to install aufs drivers
+# To enable it, copy this hook into your config/chroot_local-hooks directory.
+#
+# Note: You only want to use this hook if there is no prebuild aufs-modules-*
+# package available for your kernel flavour.
+
+# Building kernel module
+which module-assistant || apt-get install --yes module-assistant
+module-assistant update
+module-assistant --non-inter --quiet auto-install aufs
+module-assistant clean aufs
diff --git a/examples/hooks/squashfs.sh b/examples/hooks/squashfs.sh
new file mode 100755
index 000000000..5be16e6f1
--- /dev/null
+++ b/examples/hooks/squashfs.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# This is a hook for live-helper(7) to install squashfs drivers
+# To enable it, copy this hook into your config/chroot_local-hooks directory.
+#
+# Note: You only want to use this hook if there is no prebuild
+# squashfs-modules-* package available for your kernel flavour.
+
+# Building kernel module
+which module-assistant || apt-get install --yes module-assistant
+module-assistant update
+module-assistant --non-inter --quiet auto-install squashfs
+module-assistant clean squashfs
diff --git a/examples/hooks/unionfs.sh b/examples/hooks/unionfs.sh
new file mode 100755
index 000000000..bbf210a7a
--- /dev/null
+++ b/examples/hooks/unionfs.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# This is a hook for live-helper(7) to install unionfs drivers
+# To enable it, copy this hook into your config/chroot_local-hooks directory.
+#
+# Note: You only want to use this hook if there is no prebuild unionfs-modules-*
+# package available for your kernel flavour.
+
+# Building kernel module
+which module-assistant || apt-get install --yes module-assistant
+module-assistant update
+module-assistant --non-inter --quiet auto-install unionfs
+module-assistant clean unionfs