[src/trunk]: src/distrib/utils/sysinst Add def for KERNEL_9

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

details:   https://anonhg.NetBSD.org/src/rev/a57c3ec91ac8
branches:  trunk
changeset: 785715:a57c3ec91ac8
user:      garbled <garbled%NetBSD.org@localhost>
date:      Tue Mar 26 20:56:54 2013 +0000

description:
Add def for KERNEL_9
Get rid of unneeded disklabel -D in md.c
Fix pr/47684 by getting rid of a stupid NULL.

diffstat:

 distrib/utils/sysinst/arch/evbarm/md.c |  7 +------
 distrib/utils/sysinst/configmenu.c     |  4 ++--
 distrib/utils/sysinst/defs.h           |  5 +++--
 3 files changed, 6 insertions(+), 10 deletions(-)

diffs (58 lines):

diff -r 506e37d5efea -r a57c3ec91ac8 distrib/utils/sysinst/arch/evbarm/md.c
--- a/distrib/utils/sysinst/arch/evbarm/md.c    Tue Mar 26 20:52:29 2013 +0000
+++ b/distrib/utils/sysinst/arch/evbarm/md.c    Tue Mar 26 20:56:54 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.27 2013/03/19 22:16:54 garbled Exp $ */
+/*     $NetBSD: md.c,v 1.28 2013/03/26 20:56:55 garbled Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -178,11 +178,6 @@
                process_menu(MENU_ok, NULL);
                return 1;
        }
-       /* nuke the disklabel from orbit, because d from the gzimg
-          corrupts it hopelessly
-       */
-       if (boardtype == BOARD_TYPE_RPI)
-               run_program(RUN_DISPLAY, "/sbin/disklabel -D %s", diskdev);
        return 0;
 }
 
diff -r 506e37d5efea -r a57c3ec91ac8 distrib/utils/sysinst/configmenu.c
--- a/distrib/utils/sysinst/configmenu.c        Tue Mar 26 20:52:29 2013 +0000
+++ b/distrib/utils/sysinst/configmenu.c        Tue Mar 26 20:56:54 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: configmenu.c,v 1.6 2013/03/19 22:16:53 garbled Exp $ */
+/* $NetBSD: configmenu.c,v 1.7 2013/03/26 20:56:54 garbled Exp $ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -92,7 +92,7 @@
        {MSG_enable_ntpd, CONFIGOPT_NTPD, "ntpd", toggle_rcvar, NULL},
        {MSG_run_ntpdate, CONFIGOPT_NTPDATE, "ntpdate", toggle_rcvar, NULL},
        {MSG_enable_mdnsd, CONFIGOPT_MDNSD, "mdnsd", toggle_rcvar, NULL},
-       {MSG_add_a_user, CONFIGOPT_ADDUSER, NULL, add_new_user, NULL},
+       {MSG_add_a_user, CONFIGOPT_ADDUSER, NULL, add_new_user, ""},
        {NULL,          CONFIGOPT_LAST, NULL, NULL, NULL}
 };
 
diff -r 506e37d5efea -r a57c3ec91ac8 distrib/utils/sysinst/defs.h
--- a/distrib/utils/sysinst/defs.h      Tue Mar 26 20:52:29 2013 +0000
+++ b/distrib/utils/sysinst/defs.h      Tue Mar 26 20:56:54 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: defs.h,v 1.166 2013/03/19 22:16:53 garbled Exp $       */
+/*     $NetBSD: defs.h,v 1.167 2013/03/26 20:56:54 garbled Exp $       */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -95,7 +95,8 @@
     SET_KERNEL_6,      /* MD kernel... */
     SET_KERNEL_7,      /* MD kernel... */
     SET_KERNEL_8,      /* MD kernel... */
-    SET_KERNEL_LAST,   /* allow 8 kernels */
+    SET_KERNEL_9,      /* MD kernel... */
+    SET_KERNEL_LAST,   /* allow 9 kernels */
 
     /* System sets */
     SET_BASE,          /* base */