[src/netbsd-1-4]: src/distrib/utils/sysinst pullup 1.14->1.15 (fvdl)

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

details:   https://anonhg.NetBSD.org/src/rev/739224215820
branches:  netbsd-1-4
changeset: 468614:739224215820
user:      perry <perry%NetBSD.org@localhost>
date:      Sun May 02 21:43:45 1999 +0000

description:
pullup 1.14->1.15 (fvdl)

diffstat:

 distrib/utils/sysinst/mbr.c |  37 ++++++++++++++++++++++++++++++-------
 1 files changed, 30 insertions(+), 7 deletions(-)

diffs (78 lines):

diff -r 61ef9b72e181 -r 739224215820 distrib/utils/sysinst/mbr.c
--- a/distrib/utils/sysinst/mbr.c       Sun May 02 21:40:36 1999 +0000
+++ b/distrib/utils/sysinst/mbr.c       Sun May 02 21:43:45 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mbr.c,v 1.11.2.2 1999/04/19 15:19:27 perry Exp $ */
+/*     $NetBSD: mbr.c,v 1.11.2.3 1999/05/02 21:43:45 perry Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -279,8 +279,6 @@
                        }
                } while (yesno && (numbsd != 1 || overlap));
 
-               if (activepart != -1)
-                       part[activepart].mbrp_flag = 0x80;
 
                if (numbsd == 0) {
                        msg_display(MSG_nobsdpart);
@@ -292,6 +290,21 @@
                        msg_display(MSG_multbsdpart, bsdpart);
                        process_menu(MENU_ok);
                }
+
+               if (activepart == -1) {
+                       msg_display(MSG_noactivepart);
+                       process_menu(MENU_yesno);
+                       if (yesno)
+                               part[bsdpart].mbrp_flag = 0x80;
+               } else
+                       part[activepart].mbrp_flag = 0x80;
+
+               if (bsdpart == freebsdpart) {
+                       msg_display(MSG_upgradeparttype);
+                       process_menu(MENU_yesno);
+                       if (yesno)
+                               part[bsdpart].mbrp_typ = dosptyp_nbsd;
+               }
                        
                ptstart = part[bsdpart].mbrp_start;
                ptsize = part[bsdpart].mbrp_size;
@@ -331,13 +344,25 @@
                (part[i].mbrp_start == part[j].mbrp_start);
 }
 
+char *
+get_partname(i)
+       int i;
+{
+       int j;
+
+       for (j = 0; part_ids[j].id != -1 &&
+                   part_ids[j].id != part[i].mbrp_typ; j++);
+
+       return part_ids[j].name;
+}
+
 void
 disp_cur_part(part, sel, disp)
        struct mbr_partition *part;
        int sel;
        int disp;
 {
-       int i, j, start, stop, rsize, rend;
+       int i, start, stop, rsize, rend;
 
        if (disp < 0)
                start = 0, stop = 4;
@@ -359,9 +384,7 @@
                        msg_printf_add("%d %12d%12d%12d  ", i,
                            part[i].mbrp_start / sizemult, rsize, rend);
                }
-               for (j = 0; part_ids[j].id != -1 &&
-                           part_ids[j].id != part[i].mbrp_typ; j++);
-               msg_printf_add("%s\n", part_ids[j].name);
+               msg_printf_add("%s\n", get_partname(i));
                if (sel == i)
                        msg_standend();
        }