talexander
/
freebsd_amp_hwpstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

One more fix for sysinstall/libdisk to create a device file 

if and only if a target directory is devfs.  Previous patch
doesn't correct, it's unconditionally avoid to create a device
file if kernel knows devfs.

PR:		31109
This commit is contained in:
Makoto Matsushita 2001-11-11 12:16:50 +00:00
parent dcee186b33
commit 94eacee1fc
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/libdisk/create_chunk.c
View File

@ -17,10 +17,10 @@ __FBSDID("$FreeBSD$");
#include <ctype.h> #include <ctype.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdarg.h> #include <stdarg.h>
#include <sys/types.h> #include <sys/param.h>
#include <sys/disklabel.h> #include <sys/disklabel.h>
#include <sys/diskslice.h> #include <sys/diskslice.h>
#include <sys/types.h> #include <sys/mount.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <grp.h> #include <grp.h>
@ -282,18 +282,22 @@ MakeDev(struct chunk *c1, const char *path)
char buf[BUFSIZ], buf2[BUFSIZ]; char buf[BUFSIZ], buf2[BUFSIZ];
struct group *grp; struct group *grp;
struct passwd *pwd; struct passwd *pwd;
struct statfs fs;
uid_t owner; uid_t owner;
gid_t group; gid_t group;
int mib[4];
size_t miblen;
*buf2 = '\0'; *buf2 = '\0';
miblen = sizeof(mib)/sizeof(mib[0]);
if (isDebug()) if (isDebug())
msgDebug("MakeDev: Called with %s on path %s\n", p, path); msgDebug("MakeDev: Called with %s on path %s\n", p, path);
if (!strcmp(p, "X")) if (!strcmp(p, "X"))
return 0; return 0;
if (!sysctlnametomib("vfs.devfs.generation", &mib, &miblen)) { if (statfs(path, &fs) != 0) {
#ifdef DEBUG
warn("statfs(%s) failed\n", path);
#endif
return 0;
}
if (strcmp(fs.f_fstypename, "devfs") == 0) {
if (isDebug()) if (isDebug())
msgDebug("MakeDev: No need to mknod(2) with DEVFS.\n"); msgDebug("MakeDev: No need to mknod(2) with DEVFS.\n");
return 1; return 1;