Module Name: src
Committed By: jdf
Date: Sat Apr 7 19:02:57 UTC 2012
Modified Files:
src/distrib/utils/sysinst: menus.mi util.c
Log Message:
Fix for PR 45816: Restructuring the error menu when the CD ROM is missing.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/distrib/utils/sysinst/menus.mi
cvs rdiff -u -r1.175 -r1.176 src/distrib/utils/sysinst/util.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/menus.mi
diff -u src/distrib/utils/sysinst/menus.mi:1.45 src/distrib/utils/sysinst/menus.mi:1.46
--- src/distrib/utils/sysinst/menus.mi:1.45 Fri Apr 6 23:48:53 2012
+++ src/distrib/utils/sysinst/menus.mi Sat Apr 7 19:02:57 2012
@@ -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 @@ menu floppysource, y=-4, x=0, w=70, no b
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);},
Index: src/distrib/utils/sysinst/util.c
diff -u src/distrib/utils/sysinst/util.c:1.175 src/distrib/utils/sysinst/util.c:1.176
--- src/distrib/utils/sysinst/util.c:1.175 Fri Apr 6 23:48:54 2012
+++ src/distrib/utils/sysinst/util.c Sat Apr 7 19:02:57 2012
@@ -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 @@ get_via_cdrom(void)
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 */
