[SCM] debian-live branch, master, updated. 1.0_a48-1-54-gbad1a86
Chris Lamb
chris at chris-lamb.co.uk
Tue Aug 12 06:16:04 UTC 2008
The following commit has been merged in the master branch:
commit bad1a86ed330efecf71a1a247db4421775cd0157
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Tue Aug 12 06:44:21 2008 +0100
Always create stagefile for chroot_install-packages and require it for lh_source
This is required as lh_source will generate an incomplete source tarball if
only the bootstrap phase has been completed.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/helpers/lh_chroot_install-packages b/helpers/lh_chroot_install-packages
index c97adde..e8e0ec1 100755
--- a/helpers/lh_chroot_install-packages
+++ b/helpers/lh_chroot_install-packages
@@ -64,6 +64,7 @@ then
# Saving cache
Save_cache cache/packages_chroot
- # Creating stage file
- Create_stagefile .stage/chroot_install-packages
fi
+
+# Creating stage file
+Create_stagefile .stage/chroot_install-packages
diff --git a/helpers/lh_source b/helpers/lh_source
index 5b668a0..df7cffe 100755
--- a/helpers/lh_source
+++ b/helpers/lh_source
@@ -28,6 +28,8 @@ Arguments "${@}"
Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
+Require_stagefile .stage/chroot_install-packages
+
# Enabling network in chroot
lh_chroot_hosts install ${*}
lh_chroot_resolv install ${*}
--
debian-live
More information about the debian-live-changes
mailing list