[src/trunk]: src/distrib/utils/sysinst Fix for PR 45816: Restructuring the er...

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

details:   https://anonhg.NetBSD.org/src/rev/ea67a60393d9
branches:  trunk
changeset: 778671:ea67a60393d9
user:      jdf <jdf%NetBSD.org@localhost>
date:      Sat Apr 07 19:02:57 2012 +0000

description:
Fix for PR 45816: Restructuring the error menu when the CD ROM is missing.

diffstat:

 distrib/utils/sysinst/menus.mi |  4 ++--
 distrib/utils/sysinst/util.c   |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 9337051c58a7 -r ea67a60393d9 distrib/utils/sysinst/menus.mi
--- a/distrib/utils/sysinst/menus.mi    Sat Apr 07 18:29:08 2012 +0000
+++ b/distrib/utils/sysinst/menus.mi    Sat Apr 07 19:02:57 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: menus.mi,v 1.45 2012/04/06 23:48:53 riz Exp $  */
+/*     $NetBSD: menus.mi,v 1.46 2012/04/07 19:02:57 jdf Exp $  */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -325,7 +325,7 @@
                        clean_xfer_dir = yesno; };
 
 menu cdromsource, y=-4, x=0, w=70, no box, no clear, exitstring MSG_Continue;
-       display action { msg_display_add(MSG_cdromsource); };
+       display action { msg_display(MSG_cdromsource); };
        option {src_legend(menu, MSG_Device, cdrom_dev);},
                action { src_prompt(MSG_dev, cdrom_dev, sizeof cdrom_dev); };
        option {src_legend(menu, MSG_Set_dir_bin, set_dir_bin);},
diff -r 9337051c58a7 -r ea67a60393d9 distrib/utils/sysinst/util.c
--- a/distrib/utils/sysinst/util.c      Sat Apr 07 18:29:08 2012 +0000
+++ b/distrib/utils/sysinst/util.c      Sat Apr 07 19:02:57 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: util.c,v 1.175 2012/04/06 23:48:54 riz Exp $   */
+/*     $NetBSD: util.c,v 1.176 2012/04/07 19:02:57 jdf Exp $   */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -572,7 +572,7 @@
        else {
                umount_mnt2();
                msg_display(MSG_cd_path_not_found);
-               msg_display_add("\r\n\r\n");
+               process_menu(MENU_ok, NULL);
        }
 
        /* ask for paths on the CD */