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

Always set the MBR value. When you leave it uninitialized, it seems

Browse Source 
like libdisk does bad things. :)
This commit is contained in:
jkh 1999-08-28 12:10:13 +00:00
parent acd1b54be0
commit fd7c9f4229
3 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
release/sysinstall/disks.c
View File

@ -455,19 +455,15 @@ 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)
if (((d->chunks->part->type != freebsd) || (d->chunks->part->offset > 1)))
mbrContents = getBootMgr(d->name);
else
mbrContents = NULL;
Set_Boot_Mgr(d, mbrContents);
#endif
if (DITEM_STATUS(diskPartitionWrite(NULL)) != DITEM_SUCCESS)
msgConfirm("Disk partition write returned an error status!");

12
usr.sbin/sade/disks.c
View File

@ -455,19 +455,15 @@ 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)
if (((d->chunks->part->type != freebsd) || (d->chunks->part->offset > 1)))
mbrContents = getBootMgr(d->name);
else
mbrContents = NULL;
Set_Boot_Mgr(d, mbrContents);
#endif
if (DITEM_STATUS(diskPartitionWrite(NULL)) != DITEM_SUCCESS)
msgConfirm("Disk partition write returned an error status!");

12
usr.sbin/sysinstall/disks.c
View File

@ -455,19 +455,15 @@ 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)
if (((d->chunks->part->type != freebsd) || (d->chunks->part->offset > 1)))
mbrContents = getBootMgr(d->name);
else
mbrContents = NULL;
Set_Boot_Mgr(d, mbrContents);
#endif
if (DITEM_STATUS(diskPartitionWrite(NULL)) != DITEM_SUCCESS)
msgConfirm("Disk partition write returned an error status!");