From e4928dc223c937cbb2c92f4faeaae18330d2bce6 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Fri, 3 Jun 2011 11:10:32 +0200
Subject: 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.
---
 scripts/build/lb_bootstrap_cdebootstrap |  5 -----
 scripts/build/lb_bootstrap_debootstrap  | 14 ++------------
 scripts/build/lb_config                 | 12 +-----------
 3 files changed, 3 insertions(+), 28 deletions(-)

(limited to 'scripts/build')

diff --git a/scripts/build/lb_bootstrap_cdebootstrap b/scripts/build/lb_bootstrap_cdebootstrap
index 0c621cde4..42031acf2 100755
--- a/scripts/build/lb_bootstrap_cdebootstrap
+++ b/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')"
diff --git a/scripts/build/lb_bootstrap_debootstrap b/scripts/build/lb_bootstrap_debootstrap
index ba5ad2ecd..bcc098043 100755
--- a/scripts/build/lb_bootstrap_debootstrap
+++ b/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
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index 0e3624062..ecab5a0f9 100755
--- a/scripts/build/lb_config
+++ b/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}"
-- 
cgit v1.2.3