diff options
author | jkh <jkh@FreeBSD.org> | 1997-06-12 08:46:51 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1997-06-12 08:46:51 +0000 |
commit | f0f2f5b31c0820430df16d9fad0f02e3490c1981 (patch) | |
tree | 0d6df38141c024bc37ed000f75f0955d6d0f5f0b /usr.sbin/sysinstall/disks.c | |
parent | f6bcf2cd2305de2b89f217f381b4a04bf8a849a1 (diff) | |
download | FreeBSD-src-f0f2f5b31c0820430df16d9fad0f02e3490c1981.zip FreeBSD-src-f0f2f5b31c0820430df16d9fad0f02e3490c1981.tar.gz |
YAMF22
Diffstat (limited to 'usr.sbin/sysinstall/disks.c')
-rw-r--r-- | usr.sbin/sysinstall/disks.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/usr.sbin/sysinstall/disks.c b/usr.sbin/sysinstall/disks.c index 036268d..115e578 100644 --- a/usr.sbin/sysinstall/disks.c +++ b/usr.sbin/sysinstall/disks.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: disks.c,v 1.85 1997/05/10 17:11:24 pst Exp $ + * $Id: disks.c,v 1.86 1997/06/05 09:47:55 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -598,7 +598,8 @@ static void diskPartitionNonInteractive(Device *dev, Disk *d) { char *cp; - int i, sz; + int i, sz, all_disk = 0; + u_char *mbrContents; record_chunks(d); cp = variable_get(VAR_GEOMETRY); @@ -638,7 +639,7 @@ diskPartitionNonInteractive(Device *dev, Disk *d) /* Do really-all-the-disk-space case */ msgDebug("Warning: Devoting all of disk %s to FreeBSD.\n", d->name); - All_FreeBSD(d, TRUE); + All_FreeBSD(d, all_disk = TRUE); } else if ((sz = strtol(cp, &cp, 0))) { /* Look for sz bytes free */ @@ -675,6 +676,10 @@ diskPartitionNonInteractive(Device *dev, Disk *d) msgConfirm("`%s' is an invalid value for %s - is config file valid?", cp, VAR_PARTITION); return; } + if (!all_disk) { + mbrContents = getBootMgr(d->name); + Set_Boot_Mgr(d, mbrContents); + } variable_set2(DISK_PARTITIONED, "yes"); } } |