[src/trunk]: src/distrib/utils/sysinst allow unsetting of mountpoints in disk...

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

details:   https://anonhg.NetBSD.org/src/rev/852342cabcba
branches:  trunk
changeset: 534728:852342cabcba
user:      grant <grant%NetBSD.org@localhost>
date:      Fri Aug 02 04:08:47 2002 +0000

description:
allow unsetting of mountpoints in disklabel editor.

partially addresses install/17801.

diffstat:

 distrib/utils/sysinst/menus.mi.en |  11 +++++++----
 distrib/utils/sysinst/menus.mi.fr |  11 +++++++----
 distrib/utils/sysinst/menus.mi.pl |  11 +++++++----
 distrib/utils/sysinst/msg.mi.en   |   4 ++--
 distrib/utils/sysinst/msg.mi.fr   |   4 ++--
 distrib/utils/sysinst/msg.mi.pl   |   4 ++--
 6 files changed, 27 insertions(+), 18 deletions(-)

diffs (132 lines):

diff -r 98bc67eefcda -r 852342cabcba distrib/utils/sysinst/menus.mi.en
--- a/distrib/utils/sysinst/menus.mi.en Fri Aug 02 04:05:13 2002 +0000
+++ b/distrib/utils/sysinst/menus.mi.en Fri Aug 02 04:08:47 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: menus.mi.en,v 1.58 2002/07/31 12:44:14 grant Exp $     */
+/*     $NetBSD: menus.mi.en,v 1.59 2002/08/02 04:08:47 grant Exp $     */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -179,10 +179,13 @@
                };
        option "Mount point", 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 98bc67eefcda -r 852342cabcba distrib/utils/sysinst/menus.mi.fr
--- a/distrib/utils/sysinst/menus.mi.fr Fri Aug 02 04:05:13 2002 +0000
+++ b/distrib/utils/sysinst/menus.mi.fr Fri Aug 02 04:08:47 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: menus.mi.fr,v 1.38 2002/07/31 12:44:15 grant Exp $     */
+/*     $NetBSD: menus.mi.fr,v 1.39 2002/08/02 04:08:47 grant Exp $     */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -169,10 +169,13 @@
                };
        option "Point de montage", 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 98bc67eefcda -r 852342cabcba distrib/utils/sysinst/menus.mi.pl
--- a/distrib/utils/sysinst/menus.mi.pl Fri Aug 02 04:05:13 2002 +0000
+++ b/distrib/utils/sysinst/menus.mi.pl Fri Aug 02 04:08:47 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: menus.mi.pl,v 1.9 2002/07/31 12:44:15 grant Exp $      */
+/*     $NetBSD: menus.mi.pl,v 1.10 2002/08/02 04:08:47 grant Exp $     */
 /*     Based on english version: */
 /*     NetBSD: menus.mi.en,v 1.49 2002/04/04 14:26:44 ad Exp   */
 
@@ -181,10 +181,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 98bc67eefcda -r 852342cabcba distrib/utils/sysinst/msg.mi.en
--- a/distrib/utils/sysinst/msg.mi.en   Fri Aug 02 04:05:13 2002 +0000
+++ b/distrib/utils/sysinst/msg.mi.en   Fri Aug 02 04:08:47 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msg.mi.en,v 1.90 2002/07/29 03:05:16 grant Exp $       */
+/*     $NetBSD: msg.mi.en,v 1.91 2002/08/02 04:08:47 grant Exp $       */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -168,7 +168,7 @@
 {frag size}
 
 message mountpoint
-{mount point}
+{mount point (or 'none')}
 
 message cylname
 {cyl}
diff -r 98bc67eefcda -r 852342cabcba distrib/utils/sysinst/msg.mi.fr
--- a/distrib/utils/sysinst/msg.mi.fr   Fri Aug 02 04:05:13 2002 +0000
+++ b/distrib/utils/sysinst/msg.mi.fr   Fri Aug 02 04:08:47 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msg.mi.fr,v 1.43 2002/03/29 01:03:15 shin Exp $        */
+/*     $NetBSD: msg.mi.fr,v 1.44 2002/08/02 04:08:48 grant Exp $       */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -168,7 +168,7 @@
 {taille de fragment}
 
 message mountpoint
-{point de montage}
+{point de montage (or 'none')}
 
 message cylname
 {cyl}
diff -r 98bc67eefcda -r 852342cabcba distrib/utils/sysinst/msg.mi.pl
--- a/distrib/utils/sysinst/msg.mi.pl   Fri Aug 02 04:05:13 2002 +0000
+++ b/distrib/utils/sysinst/msg.mi.pl   Fri Aug 02 04:08:47 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msg.mi.pl,v 1.9 2002/06/02 15:05:25 zuntum Exp $       */
+/*     $NetBSD: msg.mi.pl,v 1.10 2002/08/02 04:08:48 grant 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}