Adding new setting for binary indices: If set to none, no indices are included at all.

4 files changed, 16 insertions, 15 deletions

diff --git a/functions/defaults.sh b/functions/defaults.sh
index dc2c5a191..c01e7ba9d 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -557,7 +557,12 @@ Set_defaults ()
 	LH_BINARY_IMAGES="${LH_BINARY_IMAGES:-iso}"
 
 	# Setting apt indices
-	LH_BINARY_INDICES="${LH_BINARY_INDICES:-enabled}"
+	if echo ${LH_PACKAGES_LISTS} | grep -qs -E "(stripped|minimal)\b"
+	then
+		LH_BINARY_INDICES="${LH_BINARY_INDICES:-none}"
+	else
+		LH_BINARY_INDICES="${LH_BINARY_INDICES:-enabled}"
+	fi
 
 	# Setting bootloader
 	if [ -z "${LH_BOOTLOADER}" ]
diff --git a/helpers/lh_chroot_sources b/helpers/lh_chroot_sources
index 51716d1c7..d5e640ce3 100755
--- a/helpers/lh_chroot_sources
+++ b/helpers/lh_chroot_sources
@@ -403,16 +403,12 @@ case "${1}" in
 		rm -rf chroot/var/cache/apt
 		mkdir -p chroot/var/cache/apt/archives/partial
 
-		for LIST in ${LH_PACKAGES_LISTS}
-		do
-			case "${LIST}" in
-				stripped|minimal)
-					# Cleaning apt package lists
-					rm -rf chroot/var/lib/apt/lists
-					mkdir -p chroot/var/lib/apt/lists/partial
-					;;
-			esac
-		done
+		# Cleaning apt package lists
+		if [ "${LH_BINARY_INDICES}" = "none" ]
+		then
+			rm -rf chroot/var/lib/apt/lists
+			mkdir -p chroot/var/lib/apt/lists/partial
+		fi
 
 		# Remove local package repository
 		rm -rf chroot/root/local-packages
diff --git a/helpers/lh_config b/helpers/lh_config
index 4b4118699..6e6a330a6 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -38,7 +38,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
 \t    [-a|--architecture ARCHITECTURE]\n\
 \t    [-b|--binary-images iso|net|tar|usb-hdd]\n\
 \t    [--binary-filesystem fat16|fat32]\n\
-\t    [--binary-indices enabled|disabled]\n\
+\t    [--binary-indices enabled|disabled|none]\n\
 \t    [--bootappend-install PARAMETER|\"PARAMETERS\"]\n\
 \t    [--bootappend-live PARAMETER|\"PARAMETERS\"]\n\
 \t    [--bootloader grub|syslinux|yaboot]\n\
diff --git a/manpages/lh_config.en.1 b/manpages/lh_config.en.1
index 90f37b394..63c1ab91b 100644
--- a/manpages/lh_config.en.1
+++ b/manpages/lh_config.en.1
@@ -30,7 +30,7 @@ lh_config \- create configuration for live\-helper
 .br
 	[\fB\-\-binary\-filesystem\fR fat16|fat32|ext2]
 .br
-	[\fB\-\-binary\-indices\fR enabled|disabled]
+	[\fB\-\-binary\-indices\fR enabled|disabled|none]
 .br
 	[\fB\-\-bootappend\-install\fR \fIPARAMETER\fR|\fI"PARAMETERS"\fR]
 .br
@@ -226,8 +226,8 @@ defines the architecture of the to be build image. By default, this is set to th
 defines the image type to build. By default this is set to iso to build CD/DVD images.
 .IP "\fB\-\-binary\-filesystem\fR fat16|fat32|ext2" 4
 defines the filesystem to be used in the image type. This only has an effect if the selected binary image type does allow to choose a filesystem. For example, when selection iso the resulting CD/DVD has always the filesystem ISO9660. When building usb-hdd images for usb sticks, this is active. Note that it defaults to fat16 on all architectures except sparc where it defaults to ext2. Also note that if you choose fat16 and your resulting binary image gets bigger than 2GB, the binary filesystem automatically gets switched to fat32.
-.IP "\fB\-\-binary\-indices\fR enabled|disabled" 4
-defines if the resulting images should have binary indices or not and defaults to enabled.
+.IP "\fB\-\-binary\-indices\fR enabled|disabled|none" 4
+defines if the resulting images should have binary indices or not and defaults to enabled. If set to none, no indices are included at all.
 .IP "\fB\-\-bootappend\-install\fR \fIPARAMETER\fR|\fI""PARAMETERS""\fR" 4
 sets boot parameters specific to debian-installer, if included.
 .IP "\fB\-\-bootappend\-live\fR \fIPARAMETER\fR|\fI""PARAMETERS""\fR" 4