[SCM] Debian Live build scripts branch, master, updated. 1.0.1-1-34-gc043a6b
Chris Lamb
lamby at debian.org
Sun Oct 19 16:10:04 UTC 2008
The following commit has been merged in the master branch:
commit c043a6b4f3c30301597917dd1c661f75bb1c527c
Author: Chris Lamb <lamby at debian.org>
Date: Sun Oct 19 16:58:16 2008 +0100
Setup cleanup hook in the high-level helpers.
Signed-off-by: Chris Lamb <lamby at debian.org>
diff --git a/helpers/lh_binary b/helpers/lh_binary
index 41d111c..701db6d 100755
--- a/helpers/lh_binary
+++ b/helpers/lh_binary
@@ -28,6 +28,9 @@ Arguments "${@}"
Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
+# Setup cleanup function
+Setup_cleanup
+
# Preparing root filesystem
lh_binary_chroot ${*}
diff --git a/helpers/lh_bootstrap b/helpers/lh_bootstrap
index f0277d8..0713904 100755
--- a/helpers/lh_bootstrap
+++ b/helpers/lh_bootstrap
@@ -28,6 +28,9 @@ Arguments "${@}"
Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
+# Setup cleanup function
+Setup_cleanup
+
# Bootstrapping system
lh_bootstrap_cache restore ${*}
lh_bootstrap_copy ${*}
diff --git a/helpers/lh_chroot b/helpers/lh_chroot
index 81681c3..abe3d99 100755
--- a/helpers/lh_chroot
+++ b/helpers/lh_chroot
@@ -28,6 +28,9 @@ Arguments "${@}"
Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
+# Setup cleanup function
+Setup_cleanup
+
# Configuring chroot
lh_chroot_cache restore ${*}
lh_chroot_devpts install ${*}
diff --git a/helpers/lh_source b/helpers/lh_source
index df7cffe..1982e4a 100755
--- a/helpers/lh_source
+++ b/helpers/lh_source
@@ -30,6 +30,9 @@ Set_defaults
Require_stagefile .stage/chroot_install-packages
+# Setup cleanup function
+Setup_cleanup
+
# Enabling network in chroot
lh_chroot_hosts install ${*}
lh_chroot_resolv install ${*}
--
Debian Live build scripts
More information about the debian-live-changes
mailing list