[src/trunk]: src/distrib/utils/sysinst/arch/sparc fix a couple of sparc sysin...

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

details:   https://anonhg.NetBSD.org/src/rev/2b982a5b3c29
branches:  trunk
changeset: 543195:2b982a5b3c29
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Feb 19 02:09:46 2003 +0000

description:
fix a couple of sparc sysinst bugs:
        - md_set_no_x() was turning off the "misc" and "text" sets and
        not turning off the "xcomp" and "xmisc" sets.

        - now that a kernel is installed as "/netbsd" by default, do not
        try to symlink (!) from /netbsd-GENERIC (which does not exist)
        to /netbsd.

also:
        - instead of printing the 3 kernel sets all as "Kernel       : ",
        now use "Kernel       : ", "Kernel(SCSI3): " and "Kernel(SUN4U): "

        - add a note to md.c and the menus.md.* files to keep these lists
        in sync (so that the first problem above does not occur again.)

missing:
        - a way to force that one and only one of the 3 kernel sets are
        selected.  at least the default install works now.

diffstat:

 distrib/utils/sysinst/arch/sparc/md.c        |  17 +++++++----------
 distrib/utils/sysinst/arch/sparc/md.h        |   6 +++---
 distrib/utils/sysinst/arch/sparc/menus.md.en |   3 ++-
 distrib/utils/sysinst/arch/sparc/menus.md.fr |   3 ++-
 distrib/utils/sysinst/arch/sparc/menus.md.pl |   3 ++-
 5 files changed, 16 insertions(+), 16 deletions(-)

diffs (111 lines):

diff -r 30d8d372088d -r 2b982a5b3c29 distrib/utils/sysinst/arch/sparc/md.c
--- a/distrib/utils/sysinst/arch/sparc/md.c     Wed Feb 19 01:35:04 2003 +0000
+++ b/distrib/utils/sysinst/arch/sparc/md.c     Wed Feb 19 02:09:46 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.31 2002/12/05 01:17:30 fvdl Exp $     */
+/*     $NetBSD: md.c,v 1.32 2003/02/19 02:09:46 mrg Exp $      */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -139,13 +139,6 @@
 int
 md_post_newfs(void)
 {
-       /*
-        * Create a symlink of netbsd to netbsd-GENERIC
-        * XXX This is... less than ideal... but there is no md hook between
-        * get_and_unpack_sets() and sanity_check(), and we do not want to
-        * change kern.tgz until we replace the miniroot install
-        */
-       symlink("netbsd-GENERIC",target_expand("/netbsd"));
 
        /* boot blocks ... */
        msg_display(MSG_dobootblks, diskdev);
@@ -239,10 +232,14 @@
 md_set_no_x()
 {
 
-       toggle_getit (8);
-       toggle_getit (9);
+       /*
+        * Don't forget to update the the set choice lists
+        * in the menus.md.* as well!
+        */
        toggle_getit (10);
        toggle_getit (11);
        toggle_getit (12);
        toggle_getit (13);
+       toggle_getit (14);
+       toggle_getit (15);
 }
diff -r 30d8d372088d -r 2b982a5b3c29 distrib/utils/sysinst/arch/sparc/md.h
--- a/distrib/utils/sysinst/arch/sparc/md.h     Wed Feb 19 01:35:04 2003 +0000
+++ b/distrib/utils/sysinst/arch/sparc/md.h     Wed Feb 19 02:09:46 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.h,v 1.11 2003/02/17 16:31:05 grant Exp $    */
+/*     $NetBSD: md.h,v 1.12 2003/02/19 02:09:46 mrg Exp $      */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -68,8 +68,8 @@
 #ifdef MAIN
 = {
     {"kern-GENERIC",           1, NULL, "Kernel       : "},
-    {"kern-GENERIC_SCSI3",     0, NULL, "Kernel       : "},
-    {"kern-GENERIC_SUN4U",     0, NULL, "Kernel       : "},
+    {"kern-GENERIC_SCSI3",     0, NULL, "Kernel(SCSI3): "},
+    {"kern-GENERIC_SUN4U",     0, NULL, "Kernel(SUN4U): "},
     {"base",                   1, NULL, "Base         : "},
     {"etc",                    1, NULL, "System (/etc): "},
     {"comp",                   1, NULL, "Compiler     : "},
diff -r 30d8d372088d -r 2b982a5b3c29 distrib/utils/sysinst/arch/sparc/menus.md.en
--- a/distrib/utils/sysinst/arch/sparc/menus.md.en      Wed Feb 19 01:35:04 2003 +0000
+++ b/distrib/utils/sysinst/arch/sparc/menus.md.en      Wed Feb 19 02:09:46 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: menus.md.en,v 1.15 2001/11/29 23:21:02 thorpej Exp $   */
+/*     $NetBSD: menus.md.en,v 1.16 2003/02/19 02:09:46 mrg Exp $       */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -55,6 +55,7 @@
        option "Change h", action { editpart = H;}, sub menu edfspart;
        option "Set new allocation size", action { reask_sizemult(dlcylsize); };
  
+/* don't forget to update md.c if these change numbers */
 menu md_distcustom, x=26, y=5, exit, title "Selection toggles inclusion";
        display action { show_cur_distsets (); };
        option  "Kernel (GENERIC)",      action { toggle_getit (0); };
diff -r 30d8d372088d -r 2b982a5b3c29 distrib/utils/sysinst/arch/sparc/menus.md.fr
--- a/distrib/utils/sysinst/arch/sparc/menus.md.fr      Wed Feb 19 01:35:04 2003 +0000
+++ b/distrib/utils/sysinst/arch/sparc/menus.md.fr      Wed Feb 19 02:09:46 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: menus.md.fr,v 1.16 2001/11/29 23:21:02 thorpej Exp $   */
+/*     $NetBSD: menus.md.fr,v 1.17 2003/02/19 02:09:46 mrg Exp $       */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -55,6 +55,7 @@
        option "Changer h", action { editpart = H;}, sub menu edfspart;
        option "Nouvelle taille d'allocation", action { reask_sizemult(dlcylsize); };
  
+/* don't forget to update md.c if these change numbers */
 menu md_distcustom, x=26, y=5, exit, title "Sélection des composants";
        display action { show_cur_distsets (); };
        option  "Kernel (GENERIC)",      action { toggle_getit (0); };
diff -r 30d8d372088d -r 2b982a5b3c29 distrib/utils/sysinst/arch/sparc/menus.md.pl
--- a/distrib/utils/sysinst/arch/sparc/menus.md.pl      Wed Feb 19 01:35:04 2003 +0000
+++ b/distrib/utils/sysinst/arch/sparc/menus.md.pl      Wed Feb 19 02:09:46 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: menus.md.pl,v 1.2 2002/04/09 19:48:20 hubertf Exp $    */
+/*     $NetBSD: menus.md.pl,v 1.3 2003/02/19 02:09:46 mrg Exp $        */
 /* Based on english version: */
 /*     NetBSD: menus.md.en,v 1.15 2001/11/29 32:21:02 thorpej Exp */
 
@@ -57,6 +57,7 @@
        option "Zmien h", action { editpart = H;}, sub menu edfspart;
        option "Ustaw nowy przydzial rozmiarow", action { reask_sizemult(dlcylsize); };
  
+/* don't forget to update md.c if these change numbers */
 menu md_distcustom, x=26, y=5, exit, title "Wybierz";
        display action { show_cur_distsets (); };
        option  "Kernel (GENERIC)",              action { toggle_getit (0); };