Removed the --boot-floppies switch and mode.

Assuming this has not been used in 10 years.

4 files changed, 2 insertions, 36 deletions

diff --git a/debian/changelog b/debian/changelog
index a1f8ee2..69d00c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ debootstrap (1.0.30) UNRELEASED; urgency=low
     --no-check-gpg is not specified.
   * Clear all global variables used for options, so that unclean
     environment doesn't break debootstrap. Closes: #621657
+  * Removed the --boot-floppies switch and mode. Assuming this has
+    not been used in 10 years.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 25 Mar 2011 14:12:43 -0400
 
diff --git a/debootstrap b/debootstrap
index e7e2a44..6542efa 100755
--- a/debootstrap
+++ b/debootstrap
@@ -29,7 +29,6 @@ DISABLE_KEYRING=""
 VARIANT=""
 ARCH=""
 KEEP_DEBOOTSTRAP_DIR=""
-USE_BOOTFLOPPIES_INTERACTION=""
 USE_DEBIANINSTALLER_INTERACTION=""
 SECOND_STAGE_ONLY=""
 CHROOTDIR=""
@@ -110,7 +109,6 @@ usage()
                                (requires --second-stage)
       --extractor=TYPE       override automatic .deb extractor selection
                                (supported: $EXTRACTORS_SUPPORTED)
-      --boot-floppies        used for internal purposes by boot-floppies
       --debian-installer     used for internal purposes by debian-installer
       --private-key=file     read the private key from file
       --certificate=file     use the client certificate stored in file (PEM)
@@ -137,20 +135,7 @@ if [ $# != 0 ] ; then
 		echo "debootstrap $VERSION"
 		exit 0
 		;;
-	    --boot-floppies)
-		if [ -n "$USE_DEBIANINSTALLER_INTERACTION" ] ; then
-			error 1 ARG_BFDI "Can only use one of --boot-floppies and --debian-installer"
-		fi
-		if ! (echo -n "" >&3) 2>/dev/null; then
-			error 1 ARG_BFBYHAND "If running debootstrap by hand, don't use --boot-floppies"
-		fi
-		USE_BOOTFLOPPIES_INTERACTION=yes
-		shift
-		;;
 	    --debian-installer)
-		if [ -n "$USE_BOOTFLOPPIES_INTERACTION" ] ; then
-			error 1 ARG_BFDI "Can only use one of --boot-floppies and --debian-installer"
-		fi
 		if ! (echo -n "" >&3) 2>/dev/null; then
 			error 1 ARG_DIBYHAND "If running debootstrap by hand, don't use --debian-installer"
 		fi
@@ -478,10 +463,6 @@ if [ "$USE_DEBIANINSTALLER_INTERACTION" = yes ]; then
 	#    stdout=stderr: full log of debootstrap run
 	#    fd 3: I:/W:/etc information
 	exec 4>&3
-elif [ "$USE_BOOTFLOPPIES_INTERACTION" = yes ]; then
-	#    stdout=stderr: full log of debootstrap run
-	#    fd 3: I:/W:/etc information
-	exec 4>&3
 elif am_doing_phase printdebs; then
 	#    stderr: I:/W:/etc information
 	#    stdout: debs needed
@@ -671,8 +652,3 @@ if am_doing_phase kill_target; then
 		rm -rf "$TARGET"
 	fi
 fi
-
-if [ -n "$USE_BOOTFLOPPIES_INTERACTION" ] ; then
-	echo "I: debootstrap: Successfully completed" # goes to /dev/tty4
-	sleep 1 || true # give the user a second to see the success notice.
-fi
diff --git a/debootstrap.8 b/debootstrap.8
index 6724908..1c02818 100644
--- a/debootstrap.8
+++ b/debootstrap.8
@@ -135,9 +135,6 @@ packages.
 The resulting tarball may be passed to a later
 .BR \-\-unpack\-tarball .
 .IP
-.IP "\fB\-\-boot\-floppies\fP"
-Used for internal purposes by boot-floppies
-.IP
 .IP "\fB\-\-debian\-installer\fP"
 Used for internal purposes by the debian-installer
 .IP 
diff --git a/functions b/functions
index 46f4b78..b4f74a9 100644
--- a/functions
+++ b/functions
@@ -66,9 +66,6 @@ wgetprogress () {
 	if [ "$USE_DEBIANINSTALLER_INTERACTION" ] && [ "$PROGRESS_NEXT" ]; then
 		wget "$@" 2>&1 >/dev/null | $PKGDETAILS "WGET%" $PROGRESS_NOW $PROGRESS_NEXT $PROGRESS_END >&3
 		ret=$?
-	elif [ "$USE_BOOTFLOPPIES_INTERACTION" ] && [ "$PROGRESS_NEXT" ]; then
-		wget "$@" 2>&1 >/dev/null | $PKGDETAILS "WGET%" $PROGRESS_NOW $PROGRESS_NEXT $PROGRESS_END "$PROGRESS_WHAT" >&3
-		ret=$?
 	else
 		wget $QSWITCH "$@" 
 		ret=$?
@@ -90,12 +87,6 @@ progress () {
 		(echo "P: $now $end $name"
 		for x in "$@"; do echo "PA: $x"; done
 		echo "PF: $fmt") >&3
-	elif [ "$USE_BOOTFLOPPIES_INTERACTION" ]; then
-		PROGRESS_NOW="$now"
-		PROGRESS_END="$end"
-		PROGRESS_WHAT="`printf "$fmt" "$@"`"
-		PROGRESS_NEXT=""
-		printf "P: %s %s %s\n" $now $end "$PROGRESS_WHAT" >&3
 	fi
 }