Module Name: src
Committed By: garbled
Date: Tue Mar 26 20:56:55 UTC 2013
Modified Files:
src/distrib/utils/sysinst: configmenu.c defs.h
src/distrib/utils/sysinst/arch/evbarm: md.c
Log Message:
Add def for KERNEL_9
Get rid of unneeded disklabel -D in md.c
Fix pr/47684 by getting rid of a stupid NULL.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/utils/sysinst/configmenu.c
cvs rdiff -u -r1.166 -r1.167 src/distrib/utils/sysinst/defs.h
cvs rdiff -u -r1.27 -r1.28 src/distrib/utils/sysinst/arch/evbarm/md.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/configmenu.c
diff -u src/distrib/utils/sysinst/configmenu.c:1.6 src/distrib/utils/sysinst/configmenu.c:1.7
--- src/distrib/utils/sysinst/configmenu.c:1.6 Tue Mar 19 22:16:53 2013
+++ src/distrib/utils/sysinst/configmenu.c Tue Mar 26 20:56:54 2013
@@ -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 @@ configinfo config_list[] = {
{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}
};
Index: src/distrib/utils/sysinst/defs.h
diff -u src/distrib/utils/sysinst/defs.h:1.166 src/distrib/utils/sysinst/defs.h:1.167
--- src/distrib/utils/sysinst/defs.h:1.166 Tue Mar 19 22:16:53 2013
+++ src/distrib/utils/sysinst/defs.h Tue Mar 26 20:56:54 2013
@@ -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 @@ enum {
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 */
Index: src/distrib/utils/sysinst/arch/evbarm/md.c
diff -u src/distrib/utils/sysinst/arch/evbarm/md.c:1.27 src/distrib/utils/sysinst/arch/evbarm/md.c:1.28
--- src/distrib/utils/sysinst/arch/evbarm/md.c:1.27 Tue Mar 19 22:16:54 2013
+++ src/distrib/utils/sysinst/arch/evbarm/md.c Tue Mar 26 20:56:55 2013
@@ -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 @@ md_pre_disklabel(void)
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;
}
