[src/netbsd-2-0]: src/distrib/utils/sysinst Pull up revision 1.86 (requested ...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5dc0638c0e3a
branches:  netbsd-2-0
changeset: 561440:5dc0638c0e3a
user:      tron <tron%NetBSD.org@localhost>
date:      Thu Jun 17 09:15:45 2004 +0000

description:
Pull up revision 1.86 (requested by dsl in ticket #492):
dd->dd_no_mbr has to always be initialized.  It doesn't default to 0 since
it is allocated on the stack.  Thus, allow editing the MBR partition table
on disks that actually have a MBR.

diffstat:

 distrib/utils/sysinst/disks.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r 375be1e7278a -r 5dc0638c0e3a distrib/utils/sysinst/disks.c
--- a/distrib/utils/sysinst/disks.c     Thu Jun 17 09:14:19 2004 +0000
+++ b/distrib/utils/sysinst/disks.c     Thu Jun 17 09:15:45 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disks.c,v 1.76.2.3 2004/06/17 09:14:02 tron Exp $ */
+/*     $NetBSD: disks.c,v 1.76.2.4 2004/06/17 09:15:45 tron Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -104,8 +104,10 @@
                        cp = strchr(dd->dd_name, ':');
                        if (cp != NULL)
                                dd->dd_no_mbr = ~strcmp(cp, ":no_mbr");
-                       else
+                       else {
+                               dd->dd_no_mbr = 0;
                                cp = strchr(dd->dd_name, 0);
+                       }
 
                        snprintf(cp, 2 + 1, "%d", i);
                        if (!get_geom(dd->dd_name, &l)) {