[Midnightbsd-cvs] src: sbin/clri: Sync, $MidnightBSD$
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Nov 20 14:56:01 EST 2008
Log Message:
-----------
Sync, $MidnightBSD$
Modified Files:
--------------
src/sbin/adjkerntz:
adjkerntz.8 (r1.1.1.1 -> r1.2)
pathnames.h (r1.1.1.1 -> r1.2)
src/sbin/clri:
Makefile (r1.1.1.1 -> r1.2)
clri.8 (r1.1.1.1 -> r1.2)
clri.c (r1.1.1.1 -> r1.2)
src/sbin/comcontrol:
Makefile (r1.1.1.1 -> r1.2)
comcontrol.8 (r1.1.1.1 -> r1.2)
comcontrol.c (r1.1.1.1 -> r1.2)
src/sbin/conscontrol:
Makefile (r1.1.1.1 -> r1.2)
conscontrol.8 (r1.1.1.1 -> r1.2)
conscontrol.c (r1.1.1.1 -> r1.2)
src/sbin/devd:
Makefile (r1.3 -> r1.4)
devd.8 (r1.2 -> r1.3)
devd.cc (r1.3 -> r1.4)
devd.conf.5 (r1.2 -> r1.3)
devd.h (r1.1.1.1 -> r1.2)
devd.hh (r1.3 -> r1.4)
parse.y (r1.1.1.1 -> r1.2)
token.l (r1.1.1.1 -> r1.2)
src/sbin/devfs:
Makefile (r1.2 -> r1.3)
devfs.8 (r1.1.1.1 -> r1.2)
devfs.c (r1.2 -> r1.3)
extern.h (r1.1.1.1 -> r1.2)
rule.c (r1.1.1.2 -> r1.2)
-------------- next part --------------
Index: adjkerntz.8
===================================================================
RCS file: /home/cvs/src/sbin/adjkerntz/adjkerntz.8,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sbin/adjkerntz/adjkerntz.8 -L sbin/adjkerntz/adjkerntz.8 -u -r1.1.1.1 -r1.2
--- sbin/adjkerntz/adjkerntz.8
+++ sbin/adjkerntz/adjkerntz.8
@@ -22,6 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
+.\" $MidnightBSD$
.\" $FreeBSD: src/sbin/adjkerntz/adjkerntz.8,v 1.29 2005/02/13 22:25:15 ru Exp $
.\"
.Dd April 4, 1996
Index: pathnames.h
===================================================================
RCS file: /home/cvs/src/sbin/adjkerntz/pathnames.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sbin/adjkerntz/pathnames.h -L sbin/adjkerntz/pathnames.h -u -r1.1.1.1 -r1.2
--- sbin/adjkerntz/pathnames.h
+++ sbin/adjkerntz/pathnames.h
@@ -22,6 +22,8 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $MidnightBSD$
*/
#include <paths.h>
Index: clri.c
===================================================================
RCS file: /home/cvs/src/sbin/clri/clri.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sbin/clri/clri.c -L sbin/clri/clri.c -u -r1.1.1.1 -r1.2
--- sbin/clri/clri.c
+++ sbin/clri/clri.c
@@ -44,6 +44,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: src/sbin/clri/clri.c,v 1.15 2005/05/29 16:07:10 charnier Exp $");
+__MBSDID("$MidnightBSD$");
#include <sys/param.h>
#include <sys/disklabel.h>
Index: clri.8
===================================================================
RCS file: /home/cvs/src/sbin/clri/clri.8,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sbin/clri/clri.8 -L sbin/clri/clri.8 -u -r1.1.1.1 -r1.2
--- sbin/clri/clri.8
+++ sbin/clri/clri.8
@@ -27,6 +27,7 @@
.\"
.\" @(#)clri.8 8.2 (Berkeley) 4/19/94
.\" $FreeBSD: src/sbin/clri/clri.8,v 1.14 2004/04/09 19:58:26 markm Exp $
+.\" $MidnightBSD$
.\"
.Dd April 19, 1994
.Dt CLRI 8
Index: Makefile
===================================================================
RCS file: /home/cvs/src/sbin/clri/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sbin/clri/Makefile -L sbin/clri/Makefile -u -r1.1.1.1 -r1.2
--- sbin/clri/Makefile
+++ sbin/clri/Makefile
@@ -1,5 +1,6 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# $FreeBSD: src/sbin/clri/Makefile,v 1.6 2001/12/04 02:19:44 obrien Exp $
+# $MidnightBSD$
PROG= clri
MAN= clri.8
Index: comcontrol.c
===================================================================
RCS file: /home/cvs/src/sbin/comcontrol/comcontrol.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sbin/comcontrol/comcontrol.c -L sbin/comcontrol/comcontrol.c -u -r1.1.1.1 -r1.2
--- sbin/comcontrol/comcontrol.c
+++ sbin/comcontrol/comcontrol.c
@@ -28,6 +28,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: src/sbin/comcontrol/comcontrol.c,v 1.14 2003/08/08 19:51:01 johan Exp $");
+__MBSDID("$MidnightBSD$");
#include <ctype.h>
#include <err.h>
Index: comcontrol.8
===================================================================
RCS file: /home/cvs/src/sbin/comcontrol/comcontrol.8,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sbin/comcontrol/comcontrol.8 -L sbin/comcontrol/comcontrol.8 -u -r1.1.1.1 -r1.2
--- sbin/comcontrol/comcontrol.8
+++ sbin/comcontrol/comcontrol.8
@@ -1,4 +1,6 @@
.\" $FreeBSD: src/sbin/comcontrol/comcontrol.8,v 1.29 2005/01/18 10:09:31 ru Exp $
+.\"$MidnightBSD$
+.\"
.Dd May 15, 1994
.Dt COMCONTROL 8
.Os
Index: Makefile
===================================================================
RCS file: /home/cvs/src/sbin/comcontrol/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sbin/comcontrol/Makefile -L sbin/comcontrol/Makefile -u -r1.1.1.1 -r1.2
--- sbin/comcontrol/Makefile
+++ sbin/comcontrol/Makefile
@@ -1,5 +1,6 @@
# @(#)Makefile 5.4 (Berkeley) 6/5/91
# $FreeBSD: src/sbin/comcontrol/Makefile,v 1.7 2003/08/08 19:51:01 johan Exp $
+# $MidnightBSD$
PROG= comcontrol
MAN= comcontrol.8
Index: conscontrol.8
===================================================================
RCS file: /home/cvs/src/sbin/conscontrol/conscontrol.8,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sbin/conscontrol/conscontrol.8 -L sbin/conscontrol/conscontrol.8 -u -r1.1.1.1 -r1.2
--- sbin/conscontrol/conscontrol.8
+++ sbin/conscontrol/conscontrol.8
@@ -23,6 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
+.\" $MidnightBSD$
.\" $FreeBSD: src/sbin/conscontrol/conscontrol.8,v 1.9 2005/02/10 09:19:28 ru Exp $
.\"
.Dd October 23, 2001
Index: conscontrol.c
===================================================================
RCS file: /home/cvs/src/sbin/conscontrol/conscontrol.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sbin/conscontrol/conscontrol.c -L sbin/conscontrol/conscontrol.c -u -r1.1.1.1 -r1.2
--- sbin/conscontrol/conscontrol.c
+++ sbin/conscontrol/conscontrol.c
@@ -26,6 +26,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: src/sbin/conscontrol/conscontrol.c,v 1.4 2004/06/18 06:33:44 green Exp $");
+__MBSDID("$MidnightBSD$");
#include <sys/types.h>
#include <sys/sysctl.h>
Index: Makefile
===================================================================
RCS file: /home/cvs/src/sbin/conscontrol/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sbin/conscontrol/Makefile -L sbin/conscontrol/Makefile -u -r1.1.1.1 -r1.2
--- sbin/conscontrol/Makefile
+++ sbin/conscontrol/Makefile
@@ -1,3 +1,4 @@
+# $MidnightBSD$
# $FreeBSD: src/sbin/conscontrol/Makefile,v 1.5 2001/12/04 02:19:44 obrien Exp $
PROG= conscontrol
Index: devd.hh
===================================================================
RCS file: /home/cvs/src/sbin/devd/devd.hh,v
retrieving revision 1.3
retrieving revision 1.4
diff -L sbin/devd/devd.hh -L sbin/devd/devd.hh -u -r1.3 -r1.4
--- sbin/devd/devd.hh
+++ sbin/devd/devd.hh
@@ -23,6 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
+ * $MidnightBSD$
* $FreeBSD: src/sbin/devd/devd.hh,v 1.4 2006/01/30 22:50:13 pjd Exp $
*/
Index: devd.h
===================================================================
RCS file: /home/cvs/src/sbin/devd/devd.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sbin/devd/devd.h -L sbin/devd/devd.h -u -r1.1.1.1 -r1.2
--- sbin/devd/devd.h
+++ sbin/devd/devd.h
@@ -25,6 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
+ * $MidnightBSD$
* $FreeBSD: src/sbin/devd/devd.h,v 1.5 2005/07/10 03:37:15 imp Exp $
*/
Index: devd.cc
===================================================================
RCS file: /home/cvs/src/sbin/devd/devd.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -L sbin/devd/devd.cc -L sbin/devd/devd.cc -u -r1.3 -r1.4
--- sbin/devd/devd.cc
+++ sbin/devd/devd.cc
@@ -35,6 +35,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: src/sbin/devd/devd.cc,v 1.33 2006/09/17 22:49:26 ru Exp $");
+__MBSDID("$MidnightBSD$");
#include <sys/param.h>
#include <sys/socket.h>
Index: devd.8
===================================================================
RCS file: /home/cvs/src/sbin/devd/devd.8,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sbin/devd/devd.8 -L sbin/devd/devd.8 -u -r1.2 -r1.3
--- sbin/devd/devd.8
+++ sbin/devd/devd.8
@@ -23,6 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
+.\" $MidnightBSD$
.\" $FreeBSD: src/sbin/devd/devd.8,v 1.17 2006/09/17 22:49:26 ru Exp $
.\"
.Dd November 24, 2005
Index: parse.y
===================================================================
RCS file: /home/cvs/src/sbin/devd/parse.y,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sbin/devd/parse.y -L sbin/devd/parse.y -u -r1.1.1.1 -r1.2
--- sbin/devd/parse.y
+++ sbin/devd/parse.y
@@ -26,6 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
+ * $MidnightBSD$
* $FreeBSD: src/sbin/devd/parse.y,v 1.5 2005/07/10 03:37:15 imp Exp $
*/
Index: devd.conf.5
===================================================================
RCS file: /home/cvs/src/sbin/devd/devd.conf.5,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sbin/devd/devd.conf.5 -L sbin/devd/devd.conf.5 -u -r1.2 -r1.3
--- sbin/devd/devd.conf.5
+++ sbin/devd/devd.conf.5
@@ -22,6 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
+.\" $MidnightBSD$
.\" $FreeBSD: src/sbin/devd/devd.conf.5,v 1.11 2006/10/24 20:20:41 ru Exp $
.\"
.\" The section on comments was taken from named.conf.5, which has the
Index: token.l
===================================================================
RCS file: /home/cvs/src/sbin/devd/token.l,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sbin/devd/token.l -L sbin/devd/token.l -u -r1.1.1.1 -r1.2
--- sbin/devd/token.l
+++ sbin/devd/token.l
@@ -26,6 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
+ * $MidnightBSD$
* $FreeBSD: src/sbin/devd/token.l,v 1.6 2005/07/10 03:37:15 imp Exp $
*/
Index: Makefile
===================================================================
RCS file: /home/cvs/src/sbin/devd/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L sbin/devd/Makefile -L sbin/devd/Makefile -u -r1.3 -r1.4
--- sbin/devd/Makefile
+++ sbin/devd/Makefile
@@ -1,3 +1,4 @@
+# $MidnightBSD$
# $FreeBSD: src/sbin/devd/Makefile,v 1.8 2006/01/30 22:50:13 pjd Exp $
PROG_CXX=devd
Index: extern.h
===================================================================
RCS file: /home/cvs/src/sbin/devfs/extern.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sbin/devfs/extern.h -L sbin/devfs/extern.h -u -r1.1.1.1 -r1.2
--- sbin/devfs/extern.h
+++ sbin/devfs/extern.h
@@ -23,6 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
+ * $MidnightBSD$
* $FreeBSD: src/sbin/devfs/extern.h,v 1.3 2004/06/02 23:02:31 stefanf Exp $
*/
Index: devfs.c
===================================================================
RCS file: /home/cvs/src/sbin/devfs/devfs.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sbin/devfs/devfs.c -L sbin/devfs/devfs.c -u -r1.2 -r1.3
--- sbin/devfs/devfs.c
+++ sbin/devfs/devfs.c
@@ -30,6 +30,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: src/sbin/devfs/devfs.c,v 1.5 2004/01/22 07:23:35 grehan Exp $");
+__MBSDID("$MidnightBSD$");
#include <sys/param.h>
#include <sys/queue.h>
Index: devfs.8
===================================================================
RCS file: /home/cvs/src/sbin/devfs/devfs.8,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sbin/devfs/devfs.8 -L sbin/devfs/devfs.8 -u -r1.1.1.1 -r1.2
--- sbin/devfs/devfs.8
+++ sbin/devfs/devfs.8
@@ -23,9 +23,10 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sbin/devfs/devfs.8,v 1.15 2005/06/14 11:24:55 ru Exp $
+.\" $MidnightBSD$
+.\" $FreeBSD: src/sbin/devfs/devfs.8,v 1.18 2006/12/29 22:45:12 danger Exp $
.\"
-.Dd July 1, 2002
+.Dd November 5, 2006
.Dt DEVFS 8
.Os
.Sh NAME
@@ -237,7 +238,21 @@
.Sh FILES
.Bl -tag -compact
.It Pa /etc/defaults/devfs.rules
+Default
+.Nm
+configuration file.
.It Pa /etc/devfs.rules
+Local
+.Nm
+configuration file.
+.It Pa /etc/devfs.conf
+Boot-time
+.Nm
+configuration file.
+.It Pa /usr/share/examples/etc/devfs.conf
+Example boot-time
+.Nm
+configuration file.
.El
.Sh EXAMPLES
When the system boots,
@@ -348,6 +363,8 @@
.Xr jail 2 ,
.Xr glob 3 ,
.Xr devfs 5 ,
+.Xr devfs.conf 5 ,
+.Xr devfs.rules 5 ,
.Xr chown 8 ,
.Xr jail 8 ,
.Xr mknod 8
Index: rule.c
===================================================================
RCS file: /home/cvs/src/sbin/devfs/rule.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -L sbin/devfs/rule.c -L sbin/devfs/rule.c -u -r1.1.1.2 -r1.2
--- sbin/devfs/rule.c
+++ sbin/devfs/rule.c
@@ -30,6 +30,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: src/sbin/devfs/rule.c,v 1.7.2.1 2006/01/08 20:25:24 maxim Exp $");
+__MBSDID("$MidnightBSD$");
#include <sys/param.h>
#include <sys/conf.h>
Index: Makefile
===================================================================
RCS file: /home/cvs/src/sbin/devfs/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sbin/devfs/Makefile -L sbin/devfs/Makefile -u -r1.2 -r1.3
--- sbin/devfs/Makefile
+++ sbin/devfs/Makefile
@@ -1,3 +1,4 @@
+# $MidnightBSD$
# $FreeBSD: src/sbin/devfs/Makefile,v 1.2 2002/07/28 06:52:47 dd Exp $
PROG= devfs
More information about the Midnightbsd-cvs
mailing list