Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/sysinst/arch/prep More (ab-)usages of "yesno"



details:   https://anonhg.NetBSD.org/src/rev/6c1e68d2f8cf
branches:  trunk
changeset: 808267:6c1e68d2f8cf
user:      martin <martin%NetBSD.org@localhost>
date:      Mon May 11 13:01:08 2015 +0000

description:
More (ab-)usages of "yesno"

diffstat:

 usr.sbin/sysinst/arch/prep/md.c        |  7 ++++---
 usr.sbin/sysinst/arch/prep/menus.md.en |  6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diffs (43 lines):

diff -r c8491f09e3ea -r 6c1e68d2f8cf usr.sbin/sysinst/arch/prep/md.c
--- a/usr.sbin/sysinst/arch/prep/md.c   Mon May 11 12:57:55 2015 +0000
+++ b/usr.sbin/sysinst/arch/prep/md.c   Mon May 11 13:01:08 2015 +0000
@@ -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 @@
 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");
diff -r c8491f09e3ea -r 6c1e68d2f8cf usr.sbin/sysinst/arch/prep/menus.md.en
--- a/usr.sbin/sysinst/arch/prep/menus.md.en    Mon May 11 12:57:55 2015 +0000
+++ b/usr.sbin/sysinst/arch/prep/menus.md.en    Mon May 11 13:01:08 2015 +0000
@@ -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; };



Home | Main Index | Thread Index | Old Index