diff options
| author | Chris Lamb <chris@chris-lamb.co.uk> | 2008-06-19 19:03:10 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:03:35 +0100 |
| commit | 5f3168deb73fd1e92bec83eb839b5d7381b6b023 (patch) | |
| tree | 33e58fb3c82dc71c77cb8865731fbb275f5512e2 | |
| parent | a5e675792ae54c66b7c9ca470d3e47bc45960272 (diff) | |
| download | vyos-live-build-5f3168deb73fd1e92bec83eb839b5d7381b6b023.tar.gz vyos-live-build-5f3168deb73fd1e92bec83eb839b5d7381b6b023.zip | |
Revert aborting live d-i installation if minimal/stripped is selected and instead attempt to not break the chroot too much in this case
| -rwxr-xr-x | helpers/lh_binary_debian-installer | 11 | ||||
| -rwxr-xr-x | helpers/lh_binary_iso | 13 | ||||
| -rwxr-xr-x | helpers/lh_binary_rootfs | 13 |
3 files changed, 17 insertions, 20 deletions
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer index 3a16a1905..ee437ab3b 100755 --- a/helpers/lh_binary_debian-installer +++ b/helpers/lh_binary_debian-installer @@ -35,22 +35,13 @@ fi # Check d-i configuration case "${LH_DEBIAN_INSTALLER}" in - enabled|cdrom|netinst|netboot|businesscard) + enabled|cdrom|netinst|netboot|businesscard|live) ;; disabled) exit 0 ;; - live) - case "${LH_PACKAGES_LISTS}" in - stripped|minimal) - Echo_error "live d-i installation is incompatbile with stripped and minimal" - exit 1 - ;; - esac - ;; - *) Echo_error "debian-installer flavour ${LH_DEBIAN_INSTALLER} not supported." exit 1 diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso index 7d762afa2..32d4148b4 100755 --- a/helpers/lh_binary_iso +++ b/helpers/lh_binary_iso @@ -124,11 +124,14 @@ case "${LH_BOOTLOADER}" in ;; esac -case "${LH_PACKAGES_LISTS}" in - stripped|minimal) - GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m ${GENISOIMAGE_EXCLUDE}" - ;; -esac +if [ "${LH_DEBIAN_INSTALLER}" != "live" ] +then + case "${LH_PACKAGES_LISTS}" in + stripped|minimal) + GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m ${GENISOIMAGE_EXCLUDE}" + ;; + esac +fi cat > binary.sh << EOF genisoimage ${GENISOIMAGE_OPTIONS} -o binary.iso -J -l -cache-inodes -allow-multidot binary diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs index abd26acee..c17660d88 100755 --- a/helpers/lh_binary_rootfs +++ b/helpers/lh_binary_rootfs @@ -223,11 +223,14 @@ case "${LH_CHROOT_FILESYSTEM}" in MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -info" fi - case "${LH_PACKAGES_LISTS}" in - stripped|minimal) - MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -e $(ls chroot/boot/${LINUX}* chroot/boot/initrd.img* chroot/${LINUX}* chroot/initrd.img* | sed 's|chroot/||g')" - ;; - esac + if [ "${LH_DEBIAN_INSTALLER}" != "live" ] + then + case "${LH_PACKAGES_LISTS}" in + stripped|minimal) + MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -e $(ls chroot/boot/${LINUX}* chroot/boot/initrd.img* chroot/${LINUX}* chroot/initrd.img* | sed 's|chroot/||g')" + ;; + esac + fi if [ -f config/binary_rootfs/squashfs.sort ] then |