[SCM] live-helper branch, debian-next, updated. debian/2.0_a8-1-20-gff61184
Daniel Baumann
daniel at debian.org
Mon Mar 8 07:38:47 UTC 2010
The following commit has been merged in the debian-next branch:
commit ff61184d5c9e72371a65fd20e2ed4d0ff275e797
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Mar 8 08:24:03 2010 +0100
Only remove auxilliary packages in rootfs when not using pre-cached chroot (Closes: #572976).
diff --git a/helpers/binary_rootfs b/helpers/binary_rootfs
index 8e0ebe1..635adbb 100755
--- a/helpers/binary_rootfs
+++ b/helpers/binary_rootfs
@@ -183,6 +183,9 @@ case "${LH_CHROOT_FILESYSTEM}" in
touch .lock
else
rm -rf chroot/chroot
+
+ # Removing depends
+ Remove_package
fi
;;
@@ -193,9 +196,6 @@ case "${LH_CHROOT_FILESYSTEM}" in
# Saving cache
Save_cache cache/packages_binary
-
- # Removing depends
- Remove_package
;;
jffs2)
@@ -267,6 +267,9 @@ case "${LH_CHROOT_FILESYSTEM}" in
touch .lock
else
rm -rf chroot/chroot
+
+ # Removing depends
+ Remove_package
fi
;;
@@ -277,9 +280,6 @@ case "${LH_CHROOT_FILESYSTEM}" in
# Saving cache
Save_cache cache/packages_binary
-
- # Removing depends
- Remove_package
;;
plain)
@@ -384,6 +384,9 @@ case "${LH_CHROOT_FILESYSTEM}" in
touch .lock
else
rm -rf chroot/chroot
+
+ # Removing depends
+ Remove_package
fi
${LH_ROOT_COMMAND} chmod 0644 binary/${INITFS}/filesystem.squashfs
@@ -410,9 +413,6 @@ case "${LH_CHROOT_FILESYSTEM}" in
# Saving cache
Save_cache cache/packages_binary
-
- # Removing depends
- Remove_package
;;
none)
--
live-helper
More information about the debian-live-changes
mailing list