diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-06-22 17:19:24 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:17:11 +0100 |
| commit | 4bdc9149e62a3395e0bdd48b029a69678dd72c53 (patch) | |
| tree | 01ddec961f6e017b41f63665f949aa657ddaddde | |
| parent | a3b5cbffc36b730b9c6942d6995a08ff9fa1957b (diff) | |
| download | vyos-live-build-4bdc9149e62a3395e0bdd48b029a69678dd72c53.tar.gz vyos-live-build-4bdc9149e62a3395e0bdd48b029a69678dd72c53.zip | |
Moving chroot exclude mechanisms to one central place in binary_chroot helper.
| -rwxr-xr-x | helpers/binary_chroot | 31 | ||||
| -rwxr-xr-x | helpers/binary_rootfs | 31 |
2 files changed, 31 insertions, 31 deletions
diff --git a/helpers/binary_chroot b/helpers/binary_chroot index 4b3c24960..fb7dafe75 100755 --- a/helpers/binary_chroot +++ b/helpers/binary_chroot @@ -110,6 +110,37 @@ then done fi +# Handling chroot excludes +if [ "${LH_BUILD_WITH_CHROOT}" = "true" ] +then + if [ -f config/binary_rootfs/excludes ] + then + cp config/binary_rootfs/excludes chroot/chroot/excludes + chroot chroot/chroot /usr/bin/env -i xargs --arg-file=/excludes -I FILE bash -c 'rm -rf FILE' + rm -f chroot/chroot/excludes + fi + + if [ "${LH_DEBIAN_INSTALLER}" != "live" ] + then + case "${LH_PACKAGES_LISTS}" in + stripped|minimal) + # kernel images + rm -f chroot/chroot/boot/${LINUX}* + rm -f chroot/chroot/boot/initrd.img* + + # kernel symlinks + rm -f chroot/chroot/${LINUX}* + rm -f chroot/chroot/initrd.img* + ;; + esac + fi +else + if [ "${LH_CHROOT_FILESYSTEM}" != "squashfs" ] + then + Echo_warning "rootfs excludes are not supported on non-chrooted builds unless squashfs as chroot filesystem is used, thus ignoring excludes now." + fi +fi + if [ -n "${LH_ROOT_COMMAND}" ] then ${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot diff --git a/helpers/binary_rootfs b/helpers/binary_rootfs index c813d4648..6d6b345a1 100755 --- a/helpers/binary_rootfs +++ b/helpers/binary_rootfs @@ -82,37 +82,6 @@ do fi done -# Handling chroot excludes -if [ "${LH_BUILD_WITH_CHROOT}" = "true" ] -then - if [ -f config/binary_rootfs/excludes ] - then - cp config/binary_rootfs/excludes chroot/chroot/excludes - chroot chroot/chroot /usr/bin/env -i xargs --arg-file=/excludes -I FILE bash -c 'rm -rf FILE' - rm -f chroot/chroot/excludes - fi - - if [ "${LH_DEBIAN_INSTALLER}" != "live" ] - then - case "${LH_PACKAGES_LISTS}" in - stripped|minimal) - # kernel images - rm -f chroot/chroot/boot/${LINUX}* - rm -f chroot/chroot/boot/initrd.img* - - # kernel symlinks - rm -f chroot/chroot/${LINUX}* - rm -f chroot/chroot/initrd.img* - ;; - esac - fi -else - if [ "${LH_CHROOT_FILESYSTEM}" != "squashfs" ] - then - Echo_warning "rootfs excludes are not supported on non-chrooted builds unless squashfs as chroot filesystem is used, thus ignoring excludes now." - fi -fi - case "${LH_CHROOT_FILESYSTEM}" in ext2|ext3) # Checking depends |