diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-03-08 08:24:03 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:17:05 +0100 |
| commit | 4a7eb86edd3821cf51af52b4f83ec0910f42256a (patch) | |
| tree | 0b2dfcac15fe9bcfd114ca605ddc3bd4cfdddcea | |
| parent | e0c48ed338f52632b2a2842a4c598162d5058467 (diff) | |
| download | vyos-live-build-4a7eb86edd3821cf51af52b4f83ec0910f42256a.tar.gz vyos-live-build-4a7eb86edd3821cf51af52b4f83ec0910f42256a.zip | |
Only remove auxilliary packages in rootfs when not using pre-cached chroot (Closes: #572976).
| -rwxr-xr-x | helpers/binary_rootfs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/helpers/binary_rootfs b/helpers/binary_rootfs index 8e0ebe13f..635adbbd9 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) |