Module Name: src
Committed By: martin
Date: Mon May 11 13:01:08 UTC 2015
Modified Files:
src/usr.sbin/sysinst/arch/prep: md.c menus.md.en
Log Message:
More (ab-)usages of "yesno"
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/prep/md.c
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/prep/menus.md.en
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/arch/prep/md.c
diff -u src/usr.sbin/sysinst/arch/prep/md.c:1.3 src/usr.sbin/sysinst/arch/prep/md.c:1.4
--- src/usr.sbin/sysinst/arch/prep/md.c:1.3 Sun May 10 10:14:03 2015
+++ src/usr.sbin/sysinst/arch/prep/md.c Mon May 11 13:01:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.3 2015/05/10 10:14:03 martin Exp $ */
+/* $NetBSD: md.c,v 1.4 2015/05/11 13:01:08 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -138,13 +138,14 @@ int
md_post_extract(void)
{
char rawdev[100], bootpart[100], bootloader[100];
+ int contype;
/* if we can't make it bootable, just punt */
if (prep_nobootfix)
return 0;
- process_menu(MENU_prepconsole, NULL);
- if (yesno == 1)
+ process_menu(MENU_prepconsole, &contype);
+ if (contype == 1)
snprintf(bootloader, 100, "/usr/mdec/boot_com0");
else
snprintf(bootloader, 100, "/usr/mdec/boot");
Index: src/usr.sbin/sysinst/arch/prep/menus.md.en
diff -u src/usr.sbin/sysinst/arch/prep/menus.md.en:1.1 src/usr.sbin/sysinst/arch/prep/menus.md.en:1.2
--- src/usr.sbin/sysinst/arch/prep/menus.md.en:1.1 Sat Jul 26 19:30:46 2014
+++ src/usr.sbin/sysinst/arch/prep/menus.md.en Mon May 11 13:01:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: menus.md.en,v 1.1 2014/07/26 19:30:46 dholland Exp $ */
+/* $NetBSD: menus.md.en,v 1.2 2015/05/11 13:01:08 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -35,5 +35,5 @@
/* Menu definitions for sysinst. prep version, machine dependent. */
menu prepconsole, title "Select console device", y=-10;
- option "com0 (S1)", exit, action { yesno = 1; };
- option "VGA", exit, action { yesno = 0; };
+ option "com0 (S1)", exit, action { *((int*)arg) = 1; };
+ option "VGA", exit, action { *((int*)arg) = 0; };
