Use /dev/fd* by default, instead of /dev/rfd*

Pointed out by: alfred

2 files changed, 26 insertions, 11 deletions

diff --git a/emulators/mtools/files/patch-2 b/emulators/mtools/files/patch-2
index aeef644759c6..7b4cb71ff4ac 100644
--- a/emulators/mtools/files/patch-2
+++ b/emulators/mtools/files/patch-2
@@ -9,12 +9,12 @@
 +# devices named here in order to access the DOS file systems.  You might give
 +# ALL USERS access to ALL FLOPPY DISKS via the command
 +#
-+#     chmod a+rw /dev/*fd* /dev/rfd[0-9]*
++#     chmod a+rw /dev/fd* /dev/fd[0-9]*
 +#
 +# or you might give SPECIFIC GROUP MEMBERS access to a PARTICULAR FLOPPY DISK
 +# via the commands
 +#
-+#     chmod g+rw /dev/rfd0 ; chgrp staff /dev/rfd0
++#     chmod g+rw /dev/fd0 ; chgrp staff /dev/fd0
 +#
 +# (and ensure selected people are in a group such as staff).
 +
@@ -22,39 +22,39 @@
 +# Floppy disks.  Here, A: and B: use automatic size detection.
 +#
 +# Example: To prepare drive A: for use as a 1.44M floppy on FreeBSD:
-+#   [1] low level format with ......... fdformat /dev/rfd0.1440
-+#   [2] write a file system with ...... newfs_msdos -f 1440 /dev/rfd0
++#   [1] low level format with ......... fdformat /dev/fd0.1440
++#   [2] write a file system with ...... newfs_msdos -f 1440 /dev/fd0
 +#   [3] then use mcopy/mdir etc. in the usual way.
 +#
 +# The mformat command could also be used to build the DOS file system
 +# in place of newfs_msdos.
 +
 +# # FreeBSD floppy drives
-+drive a: file="/dev/rfd0"
-+drive b: file="/dev/rfd1"
++drive a: file="/dev/fd0"
++drive b: file="/dev/fd1"
 +
 +# Drive T: is a 1.72M floppy format with 80 cylinders, double sided (2 heads),
 +#          and 43 sectors of size 256 bytes per track.  It uses the same
 +#          floppy disk drive (fd0) as drive A: above.
 +#
 +# Example: To prepare and use a 1.72M floppy on FreeBSD:
-+#   [1] low level format with ......... fdformat /dev/rfd0.1720
++#   [1] low level format with ......... fdformat /dev/fd0.1720
 +#   [2] write a file system with ...... mformat -t 80 -h 2 -s 43 -S 1 t:
 +#   [3] then use mcopy/mdir etc. in the usual way.
 +#
-+# The above note on access permissions applies to /dev/rfd0.1720 as well.
-+drive t: file="/dev/rfd0.1720"
++# The above note on access permissions applies to /dev/fd0.1720 as well.
++drive t: file="/dev/fd0.1720"
 +
 +# Drive S: is a 720K floppy format with 80 cylinders, double sided (2 heads),
 +#          and 43 sectors of size 256 bytes per track.  It uses the same
 +#          floppy disk drive (fd0) as drive A: above.
 +#
 +# Example: To prepare and use a 720K floppy on FreeBSD:
-+#   [1] low level format with ......... fdformat /dev/rfd0.720
++#   [1] low level format with ......... fdformat /dev/fd0.720
 +#   [2] write a file system with ...... newfs_msdos -f 720 /dev/fd0
 +#   [3] then use mcopy/mdir etc. in the usual way.
 +#
-+drive s: file="/dev/rfd0.720"
++drive s: file="/dev/fd0.720"
 +
 +# SCSI hard disks
 +#  first disk (sd0) slice 1 (s1)
diff --git a/emulators/mtools/files/patch-h b/emulators/mtools/files/patch-h
new file mode 100644
index 000000000000..ced738fe59f5
--- /dev/null
+++ b/emulators/mtools/files/patch-h
@@ -0,0 +1,15 @@
+--- devices.c~	Fri Mar 30 01:50:14 2001
++++ devices.c	Fri Mar 30 01:54:49 2001
+@@ -789,9 +789,9 @@
+ #ifdef OS_freebsd
+ #define predefined_devices
+ struct device devices[] = {
+-	{"/dev/rfd0.1440", 'A', FHD312},
+-	{"/dev/rfd0.720",  'A', FDD312},
+-	{"/dev/rfd1.1200", 'B', MHD514},
++	{"/dev/fd0.1440", 'A', FHD312},
++	{"/dev/fd0.720",  'A', FDD312},
++	{"/dev/fd1.1200", 'B', MHD514},
+ 	{"/dev/sd0s1",     'C', GENHD},
+ 	REMOTE
+ };