From 5f3168deb73fd1e92bec83eb839b5d7381b6b023 Mon Sep 17 00:00:00 2001
From: Chris Lamb <chris@chris-lamb.co.uk>
Date: Thu, 19 Jun 2008 19:03:10 +0100
Subject: Revert aborting live d-i installation if minimal/stripped is selected
and instead attempt to not break the chroot too much in this case
---
helpers/lh_binary_debian-installer | 11 +----------
helpers/lh_binary_iso | 13 ++++++++-----
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 3a16a19..ee437ab 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 7d762af..32d4148 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 abd26ac..c17660d 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
--
cgit v1.0