d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

I should have committed this ages ago...

Browse Source 
Convert init(8) to use nmount() instead of mount() when
it has to mount devfs.  This doesn't happen normally,
since the kernel is supposed to mount devfs itself.
This commit is contained in:
Maxime Henrion 2002-08-03 16:21:33 +00:00
parent 526ba6d32b
commit 1f083b1e3d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=101271
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sbin/init/init.c
View File

@ -54,6 +54,7 @@ static const char rcsid[] =
#include <sys/sysctl.h>
#include <sys/wait.h>
#include <sys/stat.h>
#include <sys/uio.h>
#include <db.h>
#include <errno.h>
@ -278,9 +279,16 @@ main(int argc, char *argv[])
warning("ignoring excess arguments");
if (devfs) {
struct iovec iov[4];
char *s;
int i;
iov[0].iov_base = "fstype";
iov[0].iov_len = sizeof("fstype");
iov[1].iov_base = "devfs";
iov[1].iov_len = sizeof("devfs");
iov[2].iov_base = "fspath";
iov[2].iov_len = sizeof("fspath");
/*
* Try to avoid the trailing slash in _PATH_DEV.
* Be *very* defensive.
@ -290,11 +298,15 @@ main(int argc, char *argv[])
i = strlen(s);
if (i > 0 && s[i - 1] == '/')
s[i - 1] = '\0';
mount("devfs", s, 0, 0);
free(s);
iov[3].iov_base = s;
iov[3].iov_len = strlen(s) + 1;
} else {
mount("devfs", _PATH_DEV, 0, 0);
iov[3].iov_base = _PATH_DEV;
iov[3].iov_len = sizeof(_PATH_DEV);
}
nmount(iov, 4, 0);
if (s != NULL)
free(s);
}
/*