diff options
author | phk <phk@FreeBSD.org> | 2002-10-25 11:47:58 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2002-10-25 11:47:58 +0000 |
commit | ba809b16d395400bf2dcaa0c8a6f2f919842a554 (patch) | |
tree | d1cb46d640b5baf6ac7346b2e2f3c6658dbd76f4 | |
parent | 429bcd4374070ac751bdbb74c3d588d48635fee7 (diff) | |
download | FreeBSD-src-ba809b16d395400bf2dcaa0c8a6f2f919842a554.zip FreeBSD-src-ba809b16d395400bf2dcaa0c8a6f2f919842a554.tar.gz |
Confirmed kill: "Bogon #1" is dead, killed by DEVFS.
-rw-r--r-- | usr.sbin/sade/install.c | 38 | ||||
-rw-r--r-- | usr.sbin/sysinstall/install.c | 38 |
2 files changed, 0 insertions, 76 deletions
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index df3b2ba..52fe118 100644 --- a/usr.sbin/sade/install.c +++ b/usr.sbin/sade/install.c @@ -809,44 +809,6 @@ installFixupBin(dialogMenuItem *self) fclose(fp); } #endif -#if 0 - /* BOGON #1: Resurrect /dev after bin distribution screws it up */ - dialog_clear_norefresh(); - msgNotify("Remaking all devices.. Please wait!"); - if (!Fake) - (void)unmount("/dev", MNT_FORCE); - if (vsystem("cd /dev; sh MAKEDEV all")) { - msgConfirm("MAKEDEV returned non-zero status"); - return DITEM_FAILURE | DITEM_RESTORE; - } - - dialog_clear_norefresh(); - msgNotify("Resurrecting /dev entries for slices.."); - devs = deviceFind(NULL, DEVICE_TYPE_DISK); - if (!devs) - msgFatal("Couldn't get a disk device list!"); - - /* Resurrect the slices that the former clobbered */ - for (i = 0; devs[i]; i++) { - Disk *disk = (Disk *)devs[i]->private; - Chunk *c1; - - if (!devs[i]->enabled) - continue; - if (!disk->chunks) - msgFatal("No chunk list found for %s!", disk->name); - for (c1 = disk->chunks->part; c1; c1 = c1->next) { - if (c1->type == freebsd) { - dialog_clear_norefresh(); - msgNotify("Making slice entries for %s", c1->name); - if (vsystem("cd /dev; sh MAKEDEV %sh", c1->name)) { - msgConfirm("Unable to make slice entries for %s!", c1->name); - return DITEM_FAILURE | DITEM_RESTORE; - } - } - } - } -#endif /* BOGON #2: We leave /etc in a bad state */ chmod("/etc", 0755); diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c index df3b2ba..52fe118 100644 --- a/usr.sbin/sysinstall/install.c +++ b/usr.sbin/sysinstall/install.c @@ -809,44 +809,6 @@ installFixupBin(dialogMenuItem *self) fclose(fp); } #endif -#if 0 - /* BOGON #1: Resurrect /dev after bin distribution screws it up */ - dialog_clear_norefresh(); - msgNotify("Remaking all devices.. Please wait!"); - if (!Fake) - (void)unmount("/dev", MNT_FORCE); - if (vsystem("cd /dev; sh MAKEDEV all")) { - msgConfirm("MAKEDEV returned non-zero status"); - return DITEM_FAILURE | DITEM_RESTORE; - } - - dialog_clear_norefresh(); - msgNotify("Resurrecting /dev entries for slices.."); - devs = deviceFind(NULL, DEVICE_TYPE_DISK); - if (!devs) - msgFatal("Couldn't get a disk device list!"); - - /* Resurrect the slices that the former clobbered */ - for (i = 0; devs[i]; i++) { - Disk *disk = (Disk *)devs[i]->private; - Chunk *c1; - - if (!devs[i]->enabled) - continue; - if (!disk->chunks) - msgFatal("No chunk list found for %s!", disk->name); - for (c1 = disk->chunks->part; c1; c1 = c1->next) { - if (c1->type == freebsd) { - dialog_clear_norefresh(); - msgNotify("Making slice entries for %s", c1->name); - if (vsystem("cd /dev; sh MAKEDEV %sh", c1->name)) { - msgConfirm("Unable to make slice entries for %s!", c1->name); - return DITEM_FAILURE | DITEM_RESTORE; - } - } - } - } -#endif /* BOGON #2: We leave /etc in a bad state */ chmod("/etc", 0755); |