summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lamb <lamby@debian.org>2008-10-19 16:58:16 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:03:43 +0100
commitcf53392616135a0b0984228b8d76be7658d1b5a1 (patch)
treeb9a38ee72e26a60269f6f474c11c8cda34e69349
parentf2d0d81ad090f04f26845f8d26ca5badf3c7d41a (diff)
downloadvyos-live-build-cf53392616135a0b0984228b8d76be7658d1b5a1.tar.gz
vyos-live-build-cf53392616135a0b0984228b8d76be7658d1b5a1.zip
Setup cleanup hook in the high-level helpers.
-rwxr-xr-xhelpers/lh_binary3
-rwxr-xr-xhelpers/lh_bootstrap3
-rwxr-xr-xhelpers/lh_chroot3
-rwxr-xr-xhelpers/lh_source3
4 files changed, 12 insertions, 0 deletions
diff --git a/helpers/lh_binary b/helpers/lh_binary
index 41d111c96..701db6df4 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 f0277d828..0713904c2 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 81681c35b..abe3d9924 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 df7cffe7c..1982e4a15 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 ${*}