diff options
| author | jkh <jkh@FreeBSD.org> | 1999-09-01 04:29:30 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1999-09-01 04:29:30 +0000 |
| commit | 2fdb12ea191206861f3cd9bf3a0d8ba85dd96aae (patch) | |
| tree | 629d137afaab5d765bfc0fc21e0220e1f8acb9c7 /usr.sbin/sysinstall/disks.c | |
| parent | 73a7a67d13cba01eb39397ff54125ce8d3e6f8cc (diff) | |
| download | FreeBSD-src-2fdb12ea191206861f3cd9bf3a0d8ba85dd96aae.zip FreeBSD-src-2fdb12ea191206861f3cd9bf3a0d8ba85dd96aae.tar.gz | |
MFC: Catch 3.2-stable sysinstall up to 4.0-current level functionality,
bringing in DHCP support. The only thing I left out were Poul-Henning's
newfs changes since I'm not sure if he's brought the rest of that support
into -stable yet. If it turns out that this is the case, I'll MFC those
changes too.
Diffstat (limited to 'usr.sbin/sysinstall/disks.c')
| -rw-r--r-- | usr.sbin/sysinstall/disks.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/usr.sbin/sysinstall/disks.c b/usr.sbin/sysinstall/disks.c index fe4ee82..f820976 100644 --- a/usr.sbin/sysinstall/disks.c +++ b/usr.sbin/sysinstall/disks.c @@ -455,16 +455,20 @@ diskPartition(Device *dev) * disk (i.e., the disklabel starts at sector 0), even in cases where the user has requested * booteasy or a "standard" MBR -- both would be fatal in this case. */ +#if 0 + if ((d->chunks->part->flags & CHUNK_FORCE_ALL) != CHUNK_FORCE_ALL + && (mbrContents = getBootMgr(d->name)) != NULL) + Set_Boot_Mgr(d, mbrContents); +#else /* * Don't offer to update the MBR on this disk if the first "real" chunk looks like * a FreeBSD "all disk" partition, or the disk is entirely FreeBSD. */ - if (((d->chunks->part->type != freebsd) || (d->chunks->part->offset > 1))) - mbrContents = getBootMgr(d->name); - else - mbrContents = NULL; - Set_Boot_Mgr(d, mbrContents); - + if (((d->chunks->part->type != freebsd) || (d->chunks->part->offset > 1)) && + (mbrContents = getBootMgr(d->name)) != NULL) + Set_Boot_Mgr(d, mbrContents); +#endif + if (DITEM_STATUS(diskPartitionWrite(NULL)) != DITEM_SUCCESS) msgConfirm("Disk partition write returned an error status!"); else |
