svn commit: r277434 - in stable/10: contrib/file/doc sbin/mount usr.sbin usr.sbin/fstyp

[Edward Tomasz Napierala]

Author: trasz
Date: Tue Jan 20 20:39:29 2015
New Revision: 277434
URL: https://svnweb.freebsd.org/changeset/base/277434

Log:
  MFC r275680:
  
  Add fstyp(8).  This utility, named after its SVR4 counterpart, detects
  filesystems.  It differs from file(1) in that it gives machine-parseable
  output, it outputs filesystem labels, doesn't get confused by other
  formats metadata, and runs in Capsicum sandbox.
  
  Differential Revision:	https://reviews.freebsd.org/D1255
  Relnotes:	yes
  Sponsored by:	The FreeBSD Foundation

Added:
  stable/10/usr.sbin/fstyp/
     - copied from r275680, head/usr.sbin/fstyp/
Modified:
  stable/10/contrib/file/doc/file.man
  stable/10/sbin/mount/mount.8
  stable/10/usr.sbin/Makefile
  stable/10/usr.sbin/fstyp/fstyp.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/file/doc/file.man
==============================================================================
--- stable/10/contrib/file/doc/file.man	Tue Jan 20 20:36:36 2015	(r277433)
+++ stable/10/contrib/file/doc/file.man	Tue Jan 20 20:39:29 2015	(r277434)
@@ -1,5 +1,5 @@
-.\" $File: file.man,v 1.110 2014/11/28 02:46:39 christos Exp $
-.Dd November 27, 2014
+.\" $File: file.man,v 1.106 2014/03/07 23:11:51 christos Exp $
+.Dd December 3, 2014
 .Dt FILE __CSECTION__
 .Os
 .Sh NAME
@@ -395,6 +395,7 @@ options.
 .Xr hexdump 1 ,
 .Xr od 1 ,
 .Xr strings 1 ,
+.Xr fstyp 8
 .Sh STANDARDS CONFORMANCE
 This program is believed to exceed the System V Interface Definition
 of FILE(CMD), as near as one can determine from the vague language

Modified: stable/10/sbin/mount/mount.8
==============================================================================
--- stable/10/sbin/mount/mount.8	Tue Jan 20 20:36:36 2015	(r277433)
+++ stable/10/sbin/mount/mount.8	Tue Jan 20 20:39:29 2015	(r277434)
@@ -28,7 +28,7 @@
 .\"     @(#)mount.8	8.8 (Berkeley) 6/16/94
 .\" $FreeBSD$
 .\"
-.Dd November 22, 2014
+.Dd December 3, 2014
 .Dt MOUNT 8
 .Os
 .Sh NAME
@@ -549,6 +549,7 @@ support for a particular file system mig
 .Xr fstab 5 ,
 .Xr procfs 5 ,
 .Xr automount 8 ,
+.Xr fstyp 8 ,
 .Xr kldload 8 ,
 .Xr mount_cd9660 8 ,
 .Xr mount_msdosfs 8 ,

Modified: stable/10/usr.sbin/Makefile
==============================================================================
--- stable/10/usr.sbin/Makefile	Tue Jan 20 20:36:36 2015	(r277433)
+++ stable/10/usr.sbin/Makefile	Tue Jan 20 20:39:29 2015	(r277434)
@@ -30,6 +30,7 @@ SUBDIR=	adduser \
 	extattr \
 	extattrctl \
 	fifolog \
+	fstyp \
 	fwcontrol \
 	getfmac \
 	getpmac \

Modified: stable/10/usr.sbin/fstyp/fstyp.c
==============================================================================
--- head/usr.sbin/fstyp/fstyp.c	Wed Dec 10 14:14:16 2014	(r275680)
+++ stable/10/usr.sbin/fstyp/fstyp.c	Tue Jan 20 20:39:29 2015	(r277434)
@@ -31,7 +31,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/capsicum.h>
+#include <sys/capability.h>
 #include <sys/disk.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>