diff options
author | jkh <jkh@FreeBSD.org> | 1999-09-02 00:51:16 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1999-09-02 00:51:16 +0000 |
commit | 2b983202e6de74a0ad0fc2765f080543e3895b9f (patch) | |
tree | 056879bb90e16442c3b7d9bc3de1330e328d93b9 /usr.sbin/sade/disks.c | |
parent | 3e73f6e0b13a943ed99fc8f5f463a7a251c2e797 (diff) | |
download | FreeBSD-src-2b983202e6de74a0ad0fc2765f080543e3895b9f.zip FreeBSD-src-2b983202e6de74a0ad0fc2765f080543e3895b9f.tar.gz |
Oh crud, did I ever screw the pooch! Rather than sync this with -stable,
I backed-out the changes in -current and didn't touch stable at all (I
thought I had my patch order reversed, not what actually happened).
AIEEE! I can't even blame the crack for this one since I broke my
crack pipe a few weeks ago. I think sleep deprivation gets the blame
for this one.
Medal for noticing this one goes to: Jim Bloom <bloom@acm.org>
Diffstat (limited to 'usr.sbin/sade/disks.c')
-rw-r--r-- | usr.sbin/sade/disks.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/usr.sbin/sade/disks.c b/usr.sbin/sade/disks.c index f820976..fe4ee82 100644 --- a/usr.sbin/sade/disks.c +++ b/usr.sbin/sade/disks.c @@ -455,20 +455,16 @@ 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)) != NULL) - Set_Boot_Mgr(d, mbrContents); -#endif - + if (((d->chunks->part->type != freebsd) || (d->chunks->part->offset > 1))) + mbrContents = getBootMgr(d->name); + else + mbrContents = NULL; + Set_Boot_Mgr(d, mbrContents); + if (DITEM_STATUS(diskPartitionWrite(NULL)) != DITEM_SUCCESS) msgConfirm("Disk partition write returned an error status!"); else |