diff options
| author | Joey Hess <joey@kitenet.net> | 2011-04-08 15:51:42 (GMT) |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-04-08 15:51:42 (GMT) |
| commit | e9d98f488302b8bf55cf356937613340e875402f (patch) | |
| tree | 606d75786a515ac4755c458021e8ad29abd5280a /debootstrap | |
| parent | 8ab67eded30d05a613d1f0f8c6c5420d8fe93948 (diff) | |
| download | debootstrap-e9d98f488302b8bf55cf356937613340e875402f.zip debootstrap-e9d98f488302b8bf55cf356937613340e875402f.tar.gz debootstrap-e9d98f488302b8bf55cf356937613340e875402f.tar.bz2 | |
Removed the --boot-floppies switch and mode.
Assuming this has not been used in 10 years.
Diffstat (limited to 'debootstrap')
| -rwxr-xr-x | debootstrap | 24 |
1 files changed, 0 insertions, 24 deletions
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 |