[src/netbsd-1-6]: src/distrib/utils/sysinst Pull up revision 1.10 (requested ...

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

details:   https://anonhg.NetBSD.org/src/rev/302f7e904cb9
branches:  netbsd-1-6
changeset: 529156:302f7e904cb9
user:      lukem <lukem%NetBSD.org@localhost>
date:      Sun Oct 13 23:19:59 2002 +0000

description:
Pull up revision 1.10 (requested by grant in ticket #865):
allow unsetting of mountpoints in disklabel editor.
partially addresses install/17801.

diffstat:

 distrib/utils/sysinst/menus.mi.pl |  11 +++++++----
 distrib/utils/sysinst/msg.mi.pl   |   4 ++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diffs (44 lines):

diff -r 49a099b45508 -r 302f7e904cb9 distrib/utils/sysinst/menus.mi.pl
--- a/distrib/utils/sysinst/menus.mi.pl Sun Oct 13 23:19:49 2002 +0000
+++ b/distrib/utils/sysinst/menus.mi.pl Sun Oct 13 23:19:59 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: menus.mi.pl,v 1.3.2.6 2002/10/13 23:04:54 lukem Exp $  */
+/*     $NetBSD: menus.mi.pl,v 1.3.2.7 2002/10/13 23:19:59 lukem Exp $  */
 /*     Based on english version: */
 /*     NetBSD: menus.mi.en,v 1.49 2002/04/04 14:26:44 ad Exp   */
 
@@ -187,10 +187,13 @@
                };
        option "Punkt montazu", action 
                {       if (PI_ISBSDFS(&bsdlabel[editpart]) ||
-                           bsdlabel[editpart].pi_fstype == FS_MSDOS)
-                               msg_prompt_add (MSG_mountpoint, NULL,
+                           bsdlabel[editpart].pi_fstype == FS_MSDOS) {
+                               msg_prompt_add (MSG_mountpoint,
+                                       fsmount[editpart],
                                        fsmount[editpart], 20);
-                       else {
+                               if (strcmp(fsmount[editpart], "none") == 0)
+                                       fsmount[editpart][0] = '\0';
+                       } else {
                                msg_display (MSG_nomount, 'a'+editpart);
                                process_menu (MENU_ok);
                        }
diff -r 49a099b45508 -r 302f7e904cb9 distrib/utils/sysinst/msg.mi.pl
--- a/distrib/utils/sysinst/msg.mi.pl   Sun Oct 13 23:19:49 2002 +0000
+++ b/distrib/utils/sysinst/msg.mi.pl   Sun Oct 13 23:19:59 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msg.mi.pl,v 1.1.2.3 2002/10/13 23:12:16 lukem Exp $    */
+/*     $NetBSD: msg.mi.pl,v 1.1.2.4 2002/10/13 23:19:59 lukem Exp $    */
 /*     Based on english version: */
 /*     NetBSD: msg.mi.en,v 1.86 2002/04/04 14:26:44 ad Exp     */
 
@@ -170,7 +170,7 @@
 {rozmiar frag}
 
 message mountpoint
-{mountpoint}
+{mount point (or 'none')}
 
 message cylname
 {cyl}