Removing bootstrap-keyring option.

2 files changed, 1 insertions, 16 deletions

diff --git a/scripts/build/lb_bootstrap_cdebootstrap b/scripts/build/lb_bootstrap_cdebootstrap
index dc3c1c725..e8fabe3f6 100755
--- a/scripts/build/lb_bootstrap_cdebootstrap
+++ b/scripts/build/lb_bootstrap_cdebootstrap
@@ -61,11 +61,6 @@ then
 	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --arch=${LB_ARCHITECTURES}"
 fi
 
-if [ -n "${LB_BOOTSTRAP_KEYRING}" ]
-then
-	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --keyring=${LB_BOOTSTRAP_KEYRING}"
-fi
-
 if [ "${_DEBUG}" = "true" ]
 then
 	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --debug"
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index c22dc39d2..0a72cefd6 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -34,7 +34,6 @@ USAGE="${PROGRAM}   [--apt apt|aptitude]\n\
 \t    [--bootappend-failsafe PARAMETER|\"PARAMETERS\"]\n\
 \t    [--bootloader grub|syslinux|yaboot]\n\
 \t    [--bootstrap cdebootstrap|cdebootstrap-static|debootstrap|copy]\n\
-\t    [--bootstrap-keyring PACKAGE]\n\
 \t    [--cache true|false]\n\
 \t    [--cache-indices true|false]\n\
 \t    [--cache-packages true|false]\n\
@@ -145,7 +144,7 @@ Local_arguments ()
 		apt-pipeline:,apt-recommends:,apt-secure:,apt-source-archives:,bootstrap:,cache:,cache-indices:,cache-packages:,
 		cache-stages:,debconf-frontend:,debconf-nowarnings:,debconf-priority:,dump,
 		initramfs:,initramfs-compression:,initsystem:,fdisk:,losetup:,mode:,system:,root-command:,use-fakeroot:,tasksel:,
-		templates:,architectures:,bootstrap-keyring:,clean,
+		templates:,architectures:,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:,
@@ -370,11 +369,6 @@ Local_arguments ()
 				shift 2
 				;;
 
-			--bootstrap-keyring)
-				LB_BOOTSTRAP_KEYRING="${2}"
-				shift 2
-				;;
-
 			-d|--distribution)
 				LB_DISTRIBUTION="${2}"
 				shift 2
@@ -1093,10 +1087,6 @@ cat > config/bootstrap << EOF
 # (Default: autodetected)
 LB_ARCHITECTURES="${LB_ARCHITECTURES}"
 
-# \$LB_BOOTSTRAP_KEYRING: set distribution keyring
-# (Default: empty)
-LB_BOOTSTRAP_KEYRING="${LB_BOOTSTRAP_KEYRING}"
-
 # \$LB_DISTRIBUTION: select distribution to use
 # (Default: ${LB_DISTRIBUTION})
 LB_DISTRIBUTION="${LB_DISTRIBUTION}"