summaryrefslogtreecommitdiffstats
path: root/sbin/mount
diff options
context:
space:
mode:
authordavide <davide@FreeBSD.org>2013-06-28 21:00:08 +0000
committerdavide <davide@FreeBSD.org>2013-06-28 21:00:08 +0000
commit0dd1d9c578ddc35507ac2072c5062f5d57c53147 (patch)
treee1591b3e71dfbd12dfea7bc7669be4a10541da31 /sbin/mount
parenta0c5d96b0afd2c5fdf7e4ffe2c4c54b832a5dbf2 (diff)
downloadFreeBSD-src-0dd1d9c578ddc35507ac2072c5062f5d57c53147.zip
FreeBSD-src-0dd1d9c578ddc35507ac2072c5062f5d57c53147.tar.gz
- Trim an unused and bogus Makefile for mount_smbfs.
- Reconnect with some minor modifications, in particular now selsocket() internals are adapted to use sbintime units after recent'ish calloutng switch.
Diffstat (limited to 'sbin/mount')
-rw-r--r--sbin/mount/mount.82
-rw-r--r--sbin/mount/mount.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index 7cd8026..5b670ee 100644
--- a/sbin/mount/mount.8
+++ b/sbin/mount/mount.8
@@ -450,6 +450,7 @@ However, for the following file system types:
.Cm nfs ,
.Cm nullfs ,
.Cm oldnfs ,
+.Cm smbfs ,
.Cm udf ,
and
.Cm unionfs .
@@ -544,6 +545,7 @@ support for a particular file system might be provided either on a static
.Xr mount_msdosfs 8 ,
.Xr mount_nfs 8 ,
.Xr mount_nullfs 8 ,
+.Xr mount_smbfs 8 ,
.Xr mount_udf 8 ,
.Xr mount_unionfs 8 ,
.Xr umount 8 ,
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index a156089..6284822 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -143,7 +143,7 @@ use_mountprog(const char *vfstype)
unsigned int i;
const char *fs[] = {
"cd9660", "mfs", "msdosfs", "nfs",
- "nullfs", "oldnfs", "udf", "unionfs",
+ "nullfs", "oldnfs", "smbfs", "udf", "unionfs",
NULL
};
OpenPOWER on IntegriCloud