summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--release/picobsd/bridge/crunch.conf4
-rw-r--r--release/picobsd/custom/crunch1/crunch.conf2
-rw-r--r--release/picobsd/custom/crunch2/crunch.conf2
-rw-r--r--release/picobsd/custom/floppy.etc/fstab3
-rw-r--r--release/picobsd/dial/crunch.conf4
-rw-r--r--release/picobsd/floppy.tree/etc/fstab3
-rw-r--r--release/picobsd/help/mount.hlp.en2
-rw-r--r--release/picobsd/help/mount.hlp.pl6
-rw-r--r--release/picobsd/help/mount_msdos.hlp.en13
-rw-r--r--release/picobsd/help/mount_msdos.hlp.pl13
-rw-r--r--release/picobsd/help/mount_msdosfs.hlp.en13
-rw-r--r--release/picobsd/help/mount_msdosfs.hlp.pl13
-rw-r--r--release/picobsd/install/floppy.tree/etc/fstab5
-rw-r--r--release/picobsd/isp/crunch.conf4
-rw-r--r--release/picobsd/net/crunch.conf4
-rw-r--r--release/picobsd/net/floppy.tree/etc/fstab5
16 files changed, 50 insertions, 46 deletions
diff --git a/release/picobsd/bridge/crunch.conf b/release/picobsd/bridge/crunch.conf
index a635a3bcaef1..22219539c283 100644
--- a/release/picobsd/bridge/crunch.conf
+++ b/release/picobsd/bridge/crunch.conf
@@ -101,7 +101,7 @@ progs tee # 0KB.
progs passwd # 0KB.
progs route # 8KB
-# progs mount_msdos
+# progs mount_msdosfs
# progs comcontrol
#
# If you want to run natd, remember the alias library
@@ -142,7 +142,7 @@ progs traceroute # 0KB.
# progs newfs # 12KB.
#ln newfs mount_mfs
ln chown chgrp
-# ln mount_msdos msdos
+# ln mount_msdosfs msdos
ln mount_std procfs
ln mount_std mount_procfs
diff --git a/release/picobsd/custom/crunch1/crunch.conf b/release/picobsd/custom/crunch1/crunch.conf
index cf7896208c10..2727c4b8af72 100644
--- a/release/picobsd/custom/crunch1/crunch.conf
+++ b/release/picobsd/custom/crunch1/crunch.conf
@@ -25,7 +25,7 @@ progs dd swapon tar gzip
ln test [
ln sh -sh
-# ln mount_msdos msdos
+# ln mount_msdosfs msdos
ln msg dmesg
ln chown chgrp
ln gzip gunzip
diff --git a/release/picobsd/custom/crunch2/crunch.conf b/release/picobsd/custom/crunch2/crunch.conf
index c654af34064d..a1fc8b0be203 100644
--- a/release/picobsd/custom/crunch2/crunch.conf
+++ b/release/picobsd/custom/crunch2/crunch.conf
@@ -19,7 +19,7 @@ progs ftp rlogin rsh disklabel fsck vi inetd telnetd ifconfig
progs badsect chroot clri dump ed expr fdisk find ftp grep mt
progs restore sed sleep sync hostname route dhclient telnet
progs mount_nfs ping traceroute routed natd
-progs pwd more date mount_msdos mount_cd9660 newfs
+progs pwd more date mount_msdosfs mount_cd9660 newfs
progs kill mount_std tcpdump df sps ns vm cat syslogd
progs ppp ipfw pccardd
diff --git a/release/picobsd/custom/floppy.etc/fstab b/release/picobsd/custom/floppy.etc/fstab
index 3b1e9074ea93..952d2a8b731c 100644
--- a/release/picobsd/custom/floppy.etc/fstab
+++ b/release/picobsd/custom/floppy.etc/fstab
@@ -1,6 +1,7 @@
+# $FreeBSD$
#proc /proc procfs rw 0 0
#/dev/fd0c /start_floppy ufs rw 1 1
-#/dev/wd0s1 /dos msdos rw 0 0
+#/dev/wd0s1 /dos msdosfs rw 0 0
/dev/wcd0c /cdrom cd9660 ro,noauto 0 0
/dev/wd0s1a /mnt ufs ro,noauto 0 0
/dev/wd0s1b none swap sw,noauto 0 0
diff --git a/release/picobsd/dial/crunch.conf b/release/picobsd/dial/crunch.conf
index b9d52aa59bf7..bbc545999dbd 100644
--- a/release/picobsd/dial/crunch.conf
+++ b/release/picobsd/dial/crunch.conf
@@ -30,7 +30,7 @@ progs hostname cat kill sps vm ns
progs chmod chown help getty
progs cp df fsck ping mv ln traceroute
progs ifconfig kbdcontrol moused
-progs ls mkdir mount mount_msdos mount_cd9660 mount_ext2fs
+progs ls mkdir mount mount_msdosfs mount_cd9660 mount_ext2fs
progs rm route sysctl umount reboot
progs vidcontrol
ln sh -sh
@@ -38,7 +38,7 @@ ln test [
ln sps ps
ln msg dmesg
ln ns netstat
-ln mount_msdos msdos
+ln mount_msdosfs msdos
ln mount_cd9660 cd9660
ln mount_ext2fs ext2fs
ln chown chgrp
diff --git a/release/picobsd/floppy.tree/etc/fstab b/release/picobsd/floppy.tree/etc/fstab
index 995314735fed..2b073aba1214 100644
--- a/release/picobsd/floppy.tree/etc/fstab
+++ b/release/picobsd/floppy.tree/etc/fstab
@@ -1,5 +1,6 @@
+# $FreeBSD$
proc /proc procfs rw 0 0
/dev/fd0c /fd ufs rw,noauto 0 0
-/dev/wd0s1 /dos msdos rw,noauto 0 0
+/dev/wd0s1 /dos msdosfs rw,noauto 0 0
/dev/wd0s1a /wd ufs rw,noauto 0 0
/dev/wcd0c /cdrom cd9660 ro,noauto 0 0
diff --git a/release/picobsd/help/mount.hlp.en b/release/picobsd/help/mount.hlp.en
index 526fbe87f0c0..d39003eb0091 100644
--- a/release/picobsd/help/mount.hlp.en
+++ b/release/picobsd/help/mount.hlp.en
@@ -14,7 +14,7 @@
* mount DOS primary partition (on primary IDE drive) on /dos:
- mount -t msdos /dev/wd0s1 /dos
+ mount -t msdosfs /dev/wd0s1 /dos
* mount Linux partition on /mnt
diff --git a/release/picobsd/help/mount.hlp.pl b/release/picobsd/help/mount.hlp.pl
index 0bf0bed254ae..33609abff91c 100644
--- a/release/picobsd/help/mount.hlp.pl
+++ b/release/picobsd/help/mount.hlp.pl
@@ -2,17 +2,17 @@
Sposob uzycia:
- mount [-dfpruvw] [-o opcje] [-t [ufs|msdos|ext2fs] urzadzenie punkt
+ mount [-dfpruvw] [-o opcje] [-t [ufs|msdosfs|ext2fs] urzadzenie punkt
N.p.:
* zamontuj dyskietke DOS A: na katalogu /mnt:
- mount -t msdos /dev/fd0a /mnt
+ mount -t msdosfs /dev/fd0a /mnt
* zamontuj pierwsza partycje DOS (na pierwszym dysku IDE) na /dos:
- mount -t msdos /dev/wd0s1 /dos
+ mount -t msdosfs /dev/wd0s1 /dos
* zamontuj partycje Linux na /mnt:
diff --git a/release/picobsd/help/mount_msdos.hlp.en b/release/picobsd/help/mount_msdos.hlp.en
deleted file mode 100644
index 365b65c61274..000000000000
--- a/release/picobsd/help/mount_msdos.hlp.en
+++ /dev/null
@@ -1,13 +0,0 @@
-mount_msdos mount an MS-DOS file system
-
- Usage:
-
- mount_msdos [-o options] [-u user] [-g group] [-m mask] bdev dir
-
- E.g. to mount primary DOS partition of primary IDE drive on /dos:
-
- mount_msdos /dev/wd0s1 /dos
-
- To mount first extended partition on /mnt:
-
- mount_msdos /dev/wd0s5 /mnt
diff --git a/release/picobsd/help/mount_msdos.hlp.pl b/release/picobsd/help/mount_msdos.hlp.pl
deleted file mode 100644
index b587110387aa..000000000000
--- a/release/picobsd/help/mount_msdos.hlp.pl
+++ /dev/null
@@ -1,13 +0,0 @@
-mount_msdos zamontuj system plikow MS-DOS
-
- Sposob uzycia:
-
- mount_msdos [-o opcje] [-u user] [-g grupa] [-m maska] bdev dir
-
- N.p. zeby zamontowac partycje C: z dysku IDE na /doc
-
- mount_msdos /dev/wd0s1 /dos
-
- W celu zamontowania pierwszej partycji extended"
-
- mount_msdos /dev/wd0s5 /mnt
diff --git a/release/picobsd/help/mount_msdosfs.hlp.en b/release/picobsd/help/mount_msdosfs.hlp.en
new file mode 100644
index 000000000000..cda3082f4e2f
--- /dev/null
+++ b/release/picobsd/help/mount_msdosfs.hlp.en
@@ -0,0 +1,13 @@
+mount_msdosfs mount an MS-DOS file system
+
+ Usage:
+
+ mount_msdosfs [-o options] [-u user] [-g group] [-m mask] bdev dir
+
+ E.g. to mount primary DOS partition of primary IDE drive on /dos:
+
+ mount_msdosfs /dev/wd0s1 /dos
+
+ To mount first extended partition on /mnt:
+
+ mount_msdosfs /dev/wd0s5 /mnt
diff --git a/release/picobsd/help/mount_msdosfs.hlp.pl b/release/picobsd/help/mount_msdosfs.hlp.pl
new file mode 100644
index 000000000000..09bc0c2bc8e5
--- /dev/null
+++ b/release/picobsd/help/mount_msdosfs.hlp.pl
@@ -0,0 +1,13 @@
+mount_msdosfs zamontuj system plikow MS-DOS
+
+ Sposob uzycia:
+
+ mount_msdosfs [-o opcje] [-u user] [-g grupa] [-m maska] bdev dir
+
+ N.p. zeby zamontowac partycje C: z dysku IDE na /doc
+
+ mount_msdosfs /dev/wd0s1 /dos
+
+ W celu zamontowania pierwszej partycji extended"
+
+ mount_msdosfs /dev/wd0s5 /mnt
diff --git a/release/picobsd/install/floppy.tree/etc/fstab b/release/picobsd/install/floppy.tree/etc/fstab
index 64d34ca9b1ae..b4a988fe8d95 100644
--- a/release/picobsd/install/floppy.tree/etc/fstab
+++ b/release/picobsd/install/floppy.tree/etc/fstab
@@ -1,4 +1,5 @@
+# $FreeBSD$
#proc /proc procfs rw 0 0
#/dev/fd0c /start_floppy ufs rw 1 1
-#/dev/wd0s1 /dos msdos rw 0 0
-#/dev/wcd0c /cdrom cd9660 ro,noauto 0 0
+#/dev/wd0s1 /dos msdosfs rw 0 0
+#/dev/wcd0c /cdrom cd9660 ro,noauto 0 0
diff --git a/release/picobsd/isp/crunch.conf b/release/picobsd/isp/crunch.conf
index e0f87a3d99ed..807be0b4621c 100644
--- a/release/picobsd/isp/crunch.conf
+++ b/release/picobsd/isp/crunch.conf
@@ -23,7 +23,7 @@ progs inetd telnetd stty w msg kget natd reboot
progs init fsck ifconfig df ps ns vm cat
progs cp rm mkdir ls chmod chown
progs sysctl route swapon pwd_mkdb dev_mkdb
-progs mount mount_msdos umount comcontrol
+progs mount mount_msdosfs umount comcontrol
progs kill mount_std natd
progs minigzip
@@ -39,7 +39,7 @@ ln test [
ln sh -sh
#ln newfs mount_mfs
ln chown chgrp
-ln mount_msdos msdos
+ln mount_msdosfs msdos
ln mount_std procfs
ln mount_std mount_procfs
ln msg dmesg
diff --git a/release/picobsd/net/crunch.conf b/release/picobsd/net/crunch.conf
index a89450cc4dc1..4323e56200a8 100644
--- a/release/picobsd/net/crunch.conf
+++ b/release/picobsd/net/crunch.conf
@@ -23,7 +23,7 @@ progs inetd telnetd w msg kget reboot
progs init ifconfig df sps ns vm cat
progs cp rm mknod chmod chown mkdir ls syslogd
progs sysctl route pwd_mkdb dev_mkdb
-progs mount mount_msdos umount
+progs mount mount_msdosfs umount
progs kill mount_std natd
progs pwd telnet less
@@ -40,7 +40,7 @@ ln mount_cd9660 cd9660
ln mount_nfs nfs
ln test [
ln sh -sh
-ln mount_msdos msdos
+ln mount_msdosfs msdos
ln mount_std procfs
ln mount_std mount_procfs
ln sps ps
diff --git a/release/picobsd/net/floppy.tree/etc/fstab b/release/picobsd/net/floppy.tree/etc/fstab
index 64d34ca9b1ae..b4a988fe8d95 100644
--- a/release/picobsd/net/floppy.tree/etc/fstab
+++ b/release/picobsd/net/floppy.tree/etc/fstab
@@ -1,4 +1,5 @@
+# $FreeBSD$
#proc /proc procfs rw 0 0
#/dev/fd0c /start_floppy ufs rw 1 1
-#/dev/wd0s1 /dos msdos rw 0 0
-#/dev/wcd0c /cdrom cd9660 ro,noauto 0 0
+#/dev/wd0s1 /dos msdosfs rw 0 0
+#/dev/wcd0c /cdrom cd9660 ro,noauto 0 0