aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Evans <bde@FreeBSD.org>1996-03-27 19:04:55 +0000
committerBruce Evans <bde@FreeBSD.org>1996-03-27 19:04:55 +0000
commit3dffe3c5f602f1af8fa5e948fe06b823cda8ce57 (patch)
treed5624b1327351f889f6f918062ac0d5909bf1e91
parent1170175e626a960a5cb8e04fa2f50d27b81066f3 (diff)
Notes
-rw-r--r--sys/amd64/amd64/mem.c14
-rw-r--r--sys/i386/i386/cons.c14
-rw-r--r--sys/i386/i386/mem.c14
-rw-r--r--sys/kern/tty_cons.c14
4 files changed, 34 insertions, 22 deletions
diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c
index e60c99e703db..e059cb7ee51b 100644
--- a/sys/amd64/amd64/mem.c
+++ b/sys/amd64/amd64/mem.c
@@ -38,7 +38,7 @@
*
* from: Utah $Hdr: mem.c 1.13 89/10/08$
* from: @(#)mem.c 7.2 (Berkeley) 5/9/91
- * $Id: mem.c,v 1.29 1995/12/31 09:32:16 joerg Exp $
+ * $Id: mem.c,v 1.30 1996/03/26 19:57:52 wollman Exp $
*/
/*
@@ -111,17 +111,17 @@ memdevfs_init()
"/", "kmem", &mem_cdevsw, 1, DV_CHR, 0, 2, 0640);
null_devfs_token = devfs_add_devsw(
"/", "null", &mem_cdevsw, 2, DV_CHR, 0, 0, 0666);
- random_devfs_token = devfs_add_devsw(
- "/", "random", &mem_cdevsw, 3, DV_CHR, 0, 0, 0666);
- urandom_devfs_token = devfs_add_devsw(
- "/", "urandom", &mem_cdevsw, 4, DV_CHR, 0, 0, 0666);
+ random_devfs_token = devfs_add_devswf(&mem_cdevsw, 3, DV_CHR, UID_ROOT,
+ GID_WHEEL, 0644, "random");
+ urandom_devfs_token = devfs_add_devswf(&mem_cdevsw, 4, DV_CHR, UID_ROOT,
+ GID_WHEEL, 0644, "urandom");
zero_devfs_token = devfs_add_devsw(
"/", "zero", &mem_cdevsw, 12, DV_CHR, 0, 0, 0666);
io_devfs_token = devfs_add_devsw(
"/", "io", &mem_cdevsw, 14, DV_CHR, 0, 0, 0600);
#ifdef PERFMON
- perfmon_devfs_token = devfs_add_devsw(
- "/", "perfmon", &mem_cdevsw, 32, DV_CHR, 0, 0, 0666);
+ perfmon_devfs_token = devfs_add_devswf(&mem_cdevsw, 32, DV_CHR, UID_ROOT,
+ GID_KMEM, 0640, "perfmon");
#endif /* PERFMON */
}
#endif /* DEVFS */
diff --git a/sys/i386/i386/cons.c b/sys/i386/i386/cons.c
index 69e25d0aaff3..9ab77a155f85 100644
--- a/sys/i386/i386/cons.c
+++ b/sys/i386/i386/cons.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* from: @(#)cons.c 7.2 (Berkeley) 5/9/91
- * $Id: cons.c,v 1.41 1995/12/22 13:09:30 phk Exp $
+ * $Id: cons.c,v 1.42 1996/03/27 18:55:19 bde Exp $
*/
#include <sys/param.h>
@@ -327,9 +327,15 @@ cn_drvinit(void *unused)
cdevsw_add(&dev,&cn_cdevsw,NULL);
cn_devsw_installed = 1;
#ifdef DEVFS
- cn_devfs_token = devfs_add_devswf(&cn_cdevsw, 0, DV_CHR,
- UID_ROOT, GID_WHEEL, 0600,
- "console");
+ cn_devfs_token = devfs_add_devsw(
+ "/",
+ "console",
+ &cn_cdevsw,
+ 0,
+ DV_CHR,
+ 0,
+ 0,
+ 0640);
#endif
}
}
diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c
index e60c99e703db..e059cb7ee51b 100644
--- a/sys/i386/i386/mem.c
+++ b/sys/i386/i386/mem.c
@@ -38,7 +38,7 @@
*
* from: Utah $Hdr: mem.c 1.13 89/10/08$
* from: @(#)mem.c 7.2 (Berkeley) 5/9/91
- * $Id: mem.c,v 1.29 1995/12/31 09:32:16 joerg Exp $
+ * $Id: mem.c,v 1.30 1996/03/26 19:57:52 wollman Exp $
*/
/*
@@ -111,17 +111,17 @@ memdevfs_init()
"/", "kmem", &mem_cdevsw, 1, DV_CHR, 0, 2, 0640);
null_devfs_token = devfs_add_devsw(
"/", "null", &mem_cdevsw, 2, DV_CHR, 0, 0, 0666);
- random_devfs_token = devfs_add_devsw(
- "/", "random", &mem_cdevsw, 3, DV_CHR, 0, 0, 0666);
- urandom_devfs_token = devfs_add_devsw(
- "/", "urandom", &mem_cdevsw, 4, DV_CHR, 0, 0, 0666);
+ random_devfs_token = devfs_add_devswf(&mem_cdevsw, 3, DV_CHR, UID_ROOT,
+ GID_WHEEL, 0644, "random");
+ urandom_devfs_token = devfs_add_devswf(&mem_cdevsw, 4, DV_CHR, UID_ROOT,
+ GID_WHEEL, 0644, "urandom");
zero_devfs_token = devfs_add_devsw(
"/", "zero", &mem_cdevsw, 12, DV_CHR, 0, 0, 0666);
io_devfs_token = devfs_add_devsw(
"/", "io", &mem_cdevsw, 14, DV_CHR, 0, 0, 0600);
#ifdef PERFMON
- perfmon_devfs_token = devfs_add_devsw(
- "/", "perfmon", &mem_cdevsw, 32, DV_CHR, 0, 0, 0666);
+ perfmon_devfs_token = devfs_add_devswf(&mem_cdevsw, 32, DV_CHR, UID_ROOT,
+ GID_KMEM, 0640, "perfmon");
#endif /* PERFMON */
}
#endif /* DEVFS */
diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c
index 69e25d0aaff3..9ab77a155f85 100644
--- a/sys/kern/tty_cons.c
+++ b/sys/kern/tty_cons.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* from: @(#)cons.c 7.2 (Berkeley) 5/9/91
- * $Id: cons.c,v 1.41 1995/12/22 13:09:30 phk Exp $
+ * $Id: cons.c,v 1.42 1996/03/27 18:55:19 bde Exp $
*/
#include <sys/param.h>
@@ -327,9 +327,15 @@ cn_drvinit(void *unused)
cdevsw_add(&dev,&cn_cdevsw,NULL);
cn_devsw_installed = 1;
#ifdef DEVFS
- cn_devfs_token = devfs_add_devswf(&cn_cdevsw, 0, DV_CHR,
- UID_ROOT, GID_WHEEL, 0600,
- "console");
+ cn_devfs_token = devfs_add_devsw(
+ "/",
+ "console",
+ &cn_cdevsw,
+ 0,
+ DV_CHR,
+ 0,
+ 0,
+ 0640);
#endif
}
}