Revert aborting live d-i installation if minimal/stripped is selected and instead attempt to not break the chroot too much in this case
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
This commit is contained in:
parent
3ddecb18c8
commit
30bafdae57
|
@ -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
|
||||
|
|
|
@ -124,11 +124,14 @@ case "${LH_BOOTLOADER}" in
|
|||
;;
|
||||
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
|
||||
|
|
|
@ -223,11 +223,14 @@ case "${LH_CHROOT_FILESYSTEM}" in
|
|||
MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -info"
|
||||
fi
|
||||
|
||||
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
|
||||
|
|
Loading…
Reference in New Issue