From: pikpik <pikpik.1010@gmail.com>
Date: Fri, 10 Aug 2012 01:54:04 +0000 (+0000)
Subject: Removed legacy floppy boot support
X-Git-Tag: v3.2.1~387
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/zpipe.c?a=commitdiff_plain;h=445f634a90229b98057a716287e774f54726ee14;p=minix.git

Removed legacy floppy boot support
 - fdbootparams and fdboot are removed
 - fdboot manual references are removed
---

diff --git a/commands/setup/setup.sh b/commands/setup/setup.sh
index 382b2077d..90524ce3a 100644
--- a/commands/setup/setup.sh
+++ b/commands/setup/setup.sh
@@ -747,8 +747,6 @@ installboot_nbsd -f /dev/$primary /usr/mdec/bootxx_minixfs3 >/dev/null || exit
 cp /mnt/usr/src/etc/boot.cfg.default /mnt/boot.cfg
 chroot /mnt update_bootcfg
 
-pfile="/mnt/usr/src/tools/fdbootparams"
-echo "rootdev=$root; ramimagedev=$root; save" >$pfile
 # Save name of CD drive
 cddrive="`mount | grep /usr | awk '{ print $1 }' | sed 's/p.*//'`"
 echo "cddrive=$cddrive" >>/mnt/usr/etc/rc.package
diff --git a/man/man8/setup.8 b/man/man8/setup.8
index 78e10fa09..a378b55fa 100644
--- a/man/man8/setup.8
+++ b/man/man8/setup.8
@@ -318,17 +318,6 @@ to see the various options available. Now make a new bootable image by typing
 .PP
 You just rebuilt the operating system, including all the kernel and user-mode
 parts. That did not take very long, did it?
-If you have a legacy floppy disk drive, you can make a
-bootable floppy for use later by inserting a formatted floppy and typing
-.PP
-   make fdboot
-.PP
-When you are asked to complete the path, type:
-.PP
-   fd0
-.PP
-This approach does not currently work with USB floppies since there is no MINIX 3 USB
-floppy disk driver yet. 
 To update the boot image currently installed on the hard disk, type
 .PP
    make hdboot
diff --git a/man/man8/usage.8 b/man/man8/usage.8
index 75c9df9cc..4884019f5 100644
--- a/man/man8/usage.8
+++ b/man/man8/usage.8
@@ -786,10 +786,6 @@ This makes all the different kernel parts and combines them in the file
 named
 .BR image .
 .TP
-.B make fdboot
-As above and then makes a boot floppy that you can use to restart your
-system with.  You are prompted for the floppy device name.
-.TP
 .B make hdboot
 First makes the image file and then copies it into the directory
 .BR /minix .
diff --git a/releasetools/Makefile b/releasetools/Makefile
index 9961a1c65..5e0b46374 100644
--- a/releasetools/Makefile
+++ b/releasetools/Makefile
@@ -37,7 +37,6 @@ usage:
 	@echo "	make services   # Compile and install all services" >&2
 	@echo "	make install    # Make image, and install to hard disk" >&2
 	@echo "	make hdboot     # Make image, and install to hard disk" >&2
-	@echo "	make fdboot     # Make image, and install to floppy disk" >&2
 	@echo "	make bootable   # Make hard disk bootable" >&2
 	@echo "	make nbsd_fetch	# Download current NetBSD reference sources" >&2
 	@echo "	make nbsd_diff	# Update minix-port.patch in NetBSD sources" >&2
@@ -98,10 +97,6 @@ hdboot: services
 	${INSTALL} ${DESTDIR}/boot/minix/.temp/* ${DESTDIR}/multiboot;	\
 	fi
 
-fdboot:
-	exec su root mkboot $@
-	@sync
-
 install:
 	${MAKE} includes services hdboot
 
diff --git a/releasetools/mkboot b/releasetools/mkboot
index ca9d69c8e..4ae3299f0 100755
--- a/releasetools/mkboot
+++ b/releasetools/mkboot
@@ -1,10 +1,10 @@
 #!/bin/sh
 #
-#	mkboot 2.0 - make boot floppy, make root device bootable, etc.
+#	mkboot 2.0 - make root device bootable, etc.
 #							Author: Kees J. Bot
 
 usage() {
-	echo "Usage: $0 [bootable | hdboot | fdboot [device]]" >&2
+	echo "Usage: $0 [bootable | hdboot]" >&2
 	exit 1
 }
 
@@ -31,7 +31,7 @@ mdec=/usr/mdec	# bootstraps
 
 # Check arguments.
 case "$#:$1" in
-1:bootable | 1:hdboot | [12]:fdboot )
+1:bootable | 1:hdboot )
 	action=$1 dev=$2 size=$3
 	;;
 *)	usage