Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add def for KERNEL_9 

Get rid of unneeded disklabel -D in md.c
Fix pr/47684 by getting rid of a stupid NULL.
This commit is contained in:
garbled 2013-03-26 20:56:54 +00:00
parent f1a3f8c095
commit 143c554557
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
distrib/utils/sysinst/arch/evbarm/md.c
View File

@ -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;
}

4
distrib/utils/sysinst/configmenu.c
View File

@ -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}
};

5
distrib/utils/sysinst/defs.h
View File

@ -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 */