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

Once upon a time, DEVFS was optional, major numbers where static, and /dev

Browse Source 
needed to be statically populated with device nodes.  The first two are no
longer true, which makes the third pretty moot.  In fact, we don't seem to
put device node bits into the distribution archives at all anymore.
So..... remove the god-aweful nasty hack that force unmounted devfs during
installation so that static device nodes could land in /dev.  Now that the
vnode cleaner handles this case better this isn't strictly needed, but
axeing code in sysinstall is almost always benficial.  Thanks to Don Lewis
for pointing out this attribute of sysinstall.
This commit is contained in:
Scott Long 2003-12-16 17:58:24 +00:00
parent b6679af8f0
commit b4fdd9becf
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=123571
1 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
usr.sbin/sysinstall/dist.c
View File

@ -521,7 +521,7 @@ distExtractTarball(char *path, char *dist, char *my_dir, int is_base)
{
char *buf = NULL, fname[PATH_MAX];
struct timeval start, stop;
int i, j, status, total, intr, unmounted_dev;
int i, j, status, total, intr;
int cpid, zpid, fd2, chunk, numchunks;
properties dist_attr = NULL;
const char *tmp;
@ -600,12 +600,6 @@ distExtractTarball(char *path, char *dist, char *my_dir, int is_base)
total = 0;
(void)gettimeofday(&start, (struct timezone *)NULL);
if (is_base && RunningAsInit && !Fake) {
unmounted_dev = 1;
unmount("/dev", MNT_FORCE);
} else
unmounted_dev = 0;
/* We have one or more chunks, initialize unpackers... */
mediaExtractDistBegin(root_bias(my_dir), &fd2, &zpid, &cpid);
@ -723,21 +717,6 @@ distExtractTarball(char *path, char *dist, char *my_dir, int is_base)
else
(void)mediaExtractDistEnd(zpid, cpid);
if (unmounted_dev) {
struct iovec iov[4];
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("fstype");
iov[3].iov_base = "/dev";
iov[3].iov_len = sizeof("/dev");
(void)nmount(iov, 4, 0);
unmounted_dev = 0;
}
safe_free(buf);
return (status);
}