Removing unused and not really usefull bootstrap-script option (Closes: #603114).

This option was not used anyway, and, it's actually not much of the
business of live-build anyway. People for custom distributions that
can not use the debian default scripts ship their own patched
debootstrap, and then you don't need the option anymore.

functions/defaults.sh

@@ -289,9 +289,6 @@ Set_defaults ()
 	# Exclude packages on base
 	# LB_BOOTSTRAP_EXCLUDE
 
-	# Setting distribution configuration value
-	# LB_BOOTSTRAP_CONFIG
-
 	# Setting flavour value
 	case "${LB_BOOTSTRAP}" in
 		cdebootstrap)

manpages/de/lb_config.de.1

@@ -45,8 +45,6 @@
   [\fB\-\-bootloader\fP grub|syslinux|yaboot]
 .br
   [\fB\-\-bootstrap\fP cdebootstrap|cdebootstrap\-static|debootstrap|copy]
-.br
-  [\fB\-\-bootstrap\-config\fP \fIFILE\fP]
 .br
   [\-f|\fB\-\-bootstrap\-flavour\fP minimal|standard]
 .br
@@ -356,11 +354,6 @@ debootstrap. Note that if you set the bootstrap program to copy, then your
 host system is copied. This can be useful if you want to convert/clone your
 existing host system into a live system, however, make sure you do have
 enough free space as this can, depending on your host system, get quite big.
-.IP "\fB\-\-bootstrap\-config\fP \fIFILE\fP" 4
-sets a custom configuration file for the boostrap programm of choice and is
-empty by default. Refere to the documentation of debootstrap or cdebootstrap
-for more information about that. When the bootstrap program is set to copy,
-this has no effect.
 .IP "\-f|\fB\-\-bootstrap\-flavour\fP minimal|standard" 4
 defines if the bootstrap program should bootstrap the standard system (all
 packages of priority required and important, which is the default) or a

manpages/en/lb_config.1

@@ -40,8 +40,6 @@
 	[\fB\-\-bootloader\fR grub|syslinux|yaboot]
 .br
 	[\fB\-\-bootstrap\fR cdebootstrap|cdebootstrap-static|debootstrap|copy]
-.br
-	[\fB\-\-bootstrap\-config\fR \fIFILE\fR]
 .br
 	[\-f|\fB\-\-bootstrap\-flavour\fR minimal|standard]
 .br
@@ -289,8 +287,6 @@ sets boot parameters specific to debian\-live. A complete list of boot parameter
 defines which bootloader is beeing used in the generated image. This has only an effect if the selected binary image type does allow to choose the bootloader. For example, if you build a iso, always syslinux (or more precise, isolinux) is being used. Also note that some combinations of binary images types and bootloaders may be possible but live\-build does not support them yet. \fBlb config\fR will fail to create such a not yet supported configuration and give a explanation about it. For usb\-hdd images on amd64 and i386, the default is syslinux. yaboot is only used on powerpc.
 .IP "\fB\-\-bootstrap\fR cdebootstrap|cdebootstrap-static|debootstrap|copy" 4
 defines which program is used to bootstrap the debian chroot, default is debootstrap. Note that if you set the bootstrap program to copy, then your host system is copied. This can be useful if you want to convert/clone your existing host system into a live system, however, make sure you do have enough free space as this can, depending on your host system, get quite big.
-.IP "\fB\-\-bootstrap\-config\fR \fIFILE\fR" 4
-sets a custom configuration file for the boostrap programm of choice and is empty by default. Refere to the documentation of debootstrap or cdebootstrap for more information about that. When the bootstrap program is set to copy, this has no effect.
 .IP "\-f|\fB\-\-bootstrap\-flavour\fR minimal|standard" 4
 defines if the bootstrap program should bootstrap the standard system (all packages of priority required and important, which is the default) or a minimal system (only packages of priority required, plus apt).
 .IP "\fB\-\-bootstrap\-keyring\fR \fIPACKAGE\fR" 4

scripts/build/lb_bootstrap_cdebootstrap

@@ -58,11 +58,6 @@ then
 	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --arch=${LB_ARCHITECTURES}"
 fi
 
-if [ -n "${LB_BOOTSTRAP_CONFIG}" ]
-then
-	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --suite-config=${LB_BOOTSTRAP_CONFIG}"
-fi
-
 if [ -n "${LB_BOOTSTRAP_INCLUDE}" ]
 then
 	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --include=$(echo ${LB_BOOTSTRAP_INCLUDE} | sed 's|  *|,|g')"

scripts/build/lb_bootstrap_debootstrap

@@ -64,16 +64,6 @@ then
 	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --components=$(echo ${LB_ARCHIVE_AREAS} | sed -e 's| |,|g')"
 fi
 
-if [ -n "${LB_BOOTSTRAP_CONFIG}" ]
-then
-	if [ -d "/usr/share/debootstrap/scripts/" ]
-	then
-		LB_DEBOOTSTRAP_SCRIPT="/usr/share/debootstrap/scripts/${LB_BOOTSTRAP_CONFIG}"
-	else
-		LB_DEBOOTSTRAP_SCRIPT="/usr/lib/debootstrap/scripts/${LB_BOOTSTRAP_CONFIG}"
-	fi
-fi
-
 if [ -n "${LB_BOOTSTRAP_INCLUDE}" ]
 then
 	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --include=$(echo ${LB_BOOTSTRAP_INCLUDE} | sed 's|  *|,|g')"
@@ -124,7 +114,7 @@ then
 		fi
 
 		Echo_breakage "Running debootstrap (download-only)... "
-		${LB_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}" "${LB_DEBOOTSTRAP_SCRIPT}"
+		${LB_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}"
 
 		if [ -n "${LB_ROOT_COMMAND}" ]
 		then
@@ -140,7 +130,7 @@ then
 	fi
 
 	Echo_breakage "Running debootstrap... "
-	${LB_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}" "${LB_DEBOOTSTRAP_SCRIPT}"
+	${LB_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}"
 
 	if [ -n "${LB_ROOT_COMMAND}" ]
 	then

scripts/build/lb_config

@@ -45,7 +45,6 @@ USAGE="${PROGRAM}   [--apt apt|aptitude]\n\
 \t    [--bootappend-live PARAMETER|\"PARAMETERS\"]\n\
 \t    [--bootloader grub|syslinux|yaboot]\n\
 \t    [--bootstrap cdebootstrap|cdebootstrap-static|debootstrap|copy]\n\
-\t    [--bootstrap-config FILE]\n\
 \t    [-f|--bootstrap-flavour minimal|standard]\n\
 \t    [--bootstrap-keyring PACKAGE]\n\
 \t    [--cache true|false]\n\
@@ -152,7 +151,7 @@ Local_arguments ()
 		apt-pipeline:,apt-recommends:,apt-secure:,bootstrap:,cache:,cache-indices:,cache-packages:,
 		cache-stages:,debconf-frontend:,debconf-nowarnings:,debconf-priority:,dump,
 		initramfs:,initsystem:,fdisk:,losetup:,mode:,repositories:,root-command:,use-fakeroot:,tasksel:,includes:,
-		templates:,architectures:,bootstrap-config:,bootstrap-flavour:,bootstrap-keyring:,clean,
+		templates:,architectures:,bootstrap-flavour:,bootstrap-keyring:,clean,
 		distribution:,parent-distribution:,parent-debian-installer-distribution:,parent-mirror-bootstrap:,parent-mirror-chroot:,parent-mirror-chroot-security:,parent-mirror-chroot-volatile:,parent-mirror-chroot-backports:,parent-mirror-binary:,
 		parent-mirror-binary-security:,parent-mirror-binary-volatile:,parent-mirror-binary-backports:,parent-mirror-debian-installer:,
 		mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-chroot-volatile:,mirror-chroot-backports:,mirror-binary:,
@@ -376,11 +375,6 @@ Local_arguments ()
 				shift 2
 				;;
 
-			--bootstrap-config)
-				LB_BOOTSTRAP_CONFIG="${2}"
-				shift 2
-				;;
-
 			-f|--bootstrap-flavour)
 				LB_BOOTSTRAP_FLAVOUR="${2}"
 				shift 2
@@ -1022,10 +1016,6 @@ cat > config/bootstrap << EOF
 # (Default: autodetected)
 LB_ARCHITECTURES="${LB_ARCHITECTURES}"
 
-# \$LB_BOOTSTRAP_CONFIG: set distribution config directory
-# (Default: empty)
-LB_BOOTSTRAP_CONFIG="${LB_BOOTSTRAP_CONFIG}"
-
 # \$LB_BOOTSTRAP_INCLUDE: include packages on base
 # (Default: empty)
 LB_BOOTSTRAP_INCLUDE="${LB_BOOTSTRAP_INCLUDE}"