[src/trunk]: src/distrib/utils/sysinst Oops - last change could lead to crash...

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

details:   https://anonhg.NetBSD.org/src/rev/3b59a704015b
branches:  trunk
changeset: 754090:3b59a704015b
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Apr 19 21:12:51 2010 +0000

description:
Oops - last change could lead to crashes - when not asking for a geometry,
use the default one.

diffstat:

 distrib/utils/sysinst/arch/i386/md.c |   9 +++++++--
 distrib/utils/sysinst/mbr.c          |  10 +++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diffs (55 lines):

diff -r a10fff9eed5f -r 3b59a704015b distrib/utils/sysinst/arch/i386/md.c
--- a/distrib/utils/sysinst/arch/i386/md.c      Mon Apr 19 20:35:23 2010 +0000
+++ b/distrib/utils/sysinst/arch/i386/md.c      Mon Apr 19 21:12:51 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.125 2010/04/19 20:35:23 martin Exp $ */
+/*     $NetBSD: md.c,v 1.126 2010/04/19 21:12:52 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -510,8 +510,13 @@
                }
        }
        if (biosdisk == NULL) {
-               if (nip != NULL)
+               if (nip != NULL) {
                        set_bios_geom(cyl, head, sec);
+               } else {
+                       bcyl = cyl;
+                       bhead = head;
+                       bsec = sec;
+               }
        } else {
                bcyl = biosdisk->bi_cyl;
                bhead = biosdisk->bi_head;
diff -r a10fff9eed5f -r 3b59a704015b distrib/utils/sysinst/mbr.c
--- a/distrib/utils/sysinst/mbr.c       Mon Apr 19 20:35:23 2010 +0000
+++ b/distrib/utils/sysinst/mbr.c       Mon Apr 19 21:12:51 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mbr.c,v 1.84 2010/04/19 19:22:41 martin Exp $ */
+/*     $NetBSD: mbr.c,v 1.85 2010/04/19 21:12:51 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -1299,10 +1299,6 @@
                return(md_mbr_use_wholedisk(mbri));
        }
 
-       /* Default to MB, and use bios geometry for cylinder size */
-       set_sizemultname_meg();
-       current_cylsize = bhead * bsec;
-
        mbr_menu = new_menu(NULL, NULL, 16, 0, -1, 15, 70,
                        MC_NOBOX | MC_ALWAYS_SCROLL | MC_NOCLEAR,
                        set_mbr_header, set_mbr_label, NULL,
@@ -1310,6 +1306,10 @@
        if (mbr_menu == -1)
                return 0;
 
+       /* Default to MB, and use bios geometry for cylinder size */
+       set_sizemultname_meg();
+       current_cylsize = bhead * bsec;
+
        for (;;) {
                ptstart = 0;
                ptsize = 0;