Source-Changes-HG archive

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

[src/netbsd-9]: src/usr.sbin/sysinst Pull up the following revisions(s) (requ...



details:   https://anonhg.NetBSD.org/src/rev/317a538a1e56
branches:  netbsd-9
changeset: 1002056:317a538a1e56
user:      sborrill <sborrill%NetBSD.org@localhost>
date:      Thu Nov 05 08:10:21 2020 +0000

description:
Pull up the following revisions(s) (requested by martin in ticket #1121):
        usr.sbin/sysinst/menus.mi:      revision 1.22-1.23
        usr.sbin/sysinst/msg.mi.de:     revision 1.25-1.26
        usr.sbin/sysinst/msg.mi.en:     revision 1.33-1.34
        usr.sbin/sysinst/msg.mi.pl:     revision 1.33-1.34
        usr.sbin/sysinst/msg.mi.es:     revision 1.27-1.28
        usr.sbin/sysinst/msg.mi.fr:     revision 1.32-1.33
        usr.sbin/sysinst/util.c:        revision 1.49-1.52

- When looking for available CD media, skip those that are already mounted.
- When no medium with sets is found, show a new error message and return
  to the source selection menu.
- Rearrange all source option menus to have the proper set suffix available
  (either .tgz or .tar.xz).
- Relax an assertion, the first getvfsstat() call may overestimate the file
  systems visible to us. Fixes PR 55752
- When we did not magically find any CD medium with sets, offer a manual
  override (so ISO images on USB sticks or Xen's xbd(4) work).

diffstat:

 usr.sbin/sysinst/menus.mi  |  23 +++++++++++++-------
 usr.sbin/sysinst/msg.mi.de |  40 ++++++++++++++++++++++++++++++-----
 usr.sbin/sysinst/msg.mi.en |  39 +++++++++++++++++++++++++++++-----
 usr.sbin/sysinst/msg.mi.es |  39 +++++++++++++++++++++++++++++-----
 usr.sbin/sysinst/msg.mi.fr |  20 +++++++++++++++--
 usr.sbin/sysinst/msg.mi.pl |  41 +++++++++++++++++++++++++++++-------
 usr.sbin/sysinst/util.c    |  51 ++++++++++++++++++++++++++++++++++++---------
 7 files changed, 205 insertions(+), 48 deletions(-)

diffs (truncated from 605 to 300 lines):

diff -r 3b60b3807ddc -r 317a538a1e56 usr.sbin/sysinst/menus.mi
--- a/usr.sbin/sysinst/menus.mi Wed Nov 04 13:33:10 2020 +0000
+++ b/usr.sbin/sysinst/menus.mi Thu Nov 05 08:10:21 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: menus.mi,v 1.19.2.1 2020/01/28 10:17:58 msaitoh Exp $  */
+/*     $NetBSD: menus.mi,v 1.19.2.2 2020/11/05 08:10:21 sborrill Exp $ */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -362,8 +362,10 @@
 
 menu ftpsource, y=-4, x=0, w=70, no box, no clear,
            exitstring MSG_Get_Distribution;
-       display action { msg_fmt_display(MSG_ftpsource, "%s",
-           url_proto((uintptr_t)((arg_rv*)arg)->arg)); };
+       display action {
+               msg_display_subst(MSG_ftpsource, 2, "." SETS_TAR_SUFF,
+                   url_proto((uintptr_t)((arg_rv*)arg)->arg));
+           };
        option {src_legend(menu, MSG_Host, ftp.xfer_host[(uintptr_t)((arg_rv*)arg)->arg]);},
                action { src_prompt(MSG_Host, ftp.xfer_host[(uintptr_t)((arg_rv*)arg)->arg], sizeof ftp.xfer_host[(uintptr_t)((arg_rv*)arg)->arg]); };
        option {src_legend(menu, MSG_Base_dir, ftp.dir);},
@@ -412,7 +414,8 @@
 
 menu nfssource, y=-4, x=0, w=70, no box, no clear,
            exitstring MSG_Get_Distribution;
-       display action { msg_display(MSG_nfssource); };
+       display action { const char suff[] = "." SETS_TAR_SUFF;
+               msg_display_subst(MSG_nfssource, 1, &suff); };
        option {src_legend(menu, MSG_Host, nfs_host);},
                action { src_prompt(MSG_Host, nfs_host, sizeof nfs_host); };
        option {src_legend(menu, MSG_Base_dir, nfs_dir);},
@@ -459,17 +462,20 @@
        option MSG_exit_menu_generic, exit, action { *((int*)arg) = SET_RETRY; };
 
 menu cdromsource, y=-4, x=0, w=70, no box, no clear, exitstring MSG_Continue;
-       display action { msg_display(MSG_cdromsource); };
+       display action { const char suff[] = "." SETS_TAR_SUFF;
+               msg_display_add_subst(MSG_cdromsource, 1, &suff); };
        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);},
                action { src_prompt(MSG_Set_dir_bin, set_dir_bin, sizeof set_dir_bin); };
        option {src_legend(menu, MSG_Set_dir_src, set_dir_src);},
                action { src_prompt(MSG_Set_dir_src, set_dir_src, sizeof set_dir_src); };
-       option MSG_exit_menu_generic, exit, action { *((int*)arg) = SET_RETRY; };
+       option MSG_abort_install, exit, action { *((int*)arg) = SET_ABANDON; };
+       option MSG_source_sel_retry, exit, action { *((int*)arg) = SET_RETRY; };
 
 menu localfssource, y=-4, x=0, w=70, no box, no clear, exitstring MSG_Continue;
-       display action { msg_display(MSG_localfssource); };
+       display action { const char suff[] = "." SETS_TAR_SUFF;
+               msg_display_subst(MSG_localfssource, 1, &suff); };
        option {src_legend(menu, MSG_Device, localfs_dev);},
                action { src_prompt(MSG_dev, localfs_dev, sizeof localfs_dev);};
        option {src_legend(menu, MSG_File_system, localfs_fs);},
@@ -483,7 +489,8 @@
        option MSG_exit_menu_generic, exit, action { *((int*)arg) = SET_RETRY; };
 
 menu localdirsource, y=-4, x=0, w=70, no box, no clear, exitstring MSG_Continue;
-       display action { msg_display(MSG_localdir); };
+       display action { const char suff[] = "." SETS_TAR_SUFF;
+               msg_display_subst(MSG_localdir, 1, &suff); };
        option {src_legend(menu, MSG_Base_dir, localfs_dir);},
                action { src_prompt(MSG_Base_dir, localfs_dir, 60); };
        option {src_legend(menu, MSG_Set_dir_bin, set_dir_bin);},
diff -r 3b60b3807ddc -r 317a538a1e56 usr.sbin/sysinst/msg.mi.de
--- a/usr.sbin/sysinst/msg.mi.de        Wed Nov 04 13:33:10 2020 +0000
+++ b/usr.sbin/sysinst/msg.mi.de        Thu Nov 05 08:10:21 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msg.mi.de,v 1.13.2.8 2020/10/15 19:36:50 bouyer Exp $  */
+/*     $NetBSD: msg.mi.de,v 1.13.2.9 2020/11/05 08:10:21 sborrill Exp $        */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -507,8 +507,12 @@
 definierten Satz auszuwählen.
 }
 
+/* Called with:                        Example
+ *  $0 = sets suffix                   .tgz
+ *  $1 = URL protocol used             ftp
+ */
 message ftpsource
-{Dies sind die Daten zum Aufbau einer %s-Verbindung.
+{Dies sind die Daten zum Aufbau einer $1-Verbindung.
 Falls der Benutzer "ftp" ist, benötigen Sie kein Passwort.
 
 }
@@ -519,10 +523,13 @@
 message dev
 {Laufwerk}
 
+/* Called with:                        Example
+ *  $0 = sets suffix                   .tgz
+ */
 message nfssource
 {Geben Sie den NFS-Server samt Verzeichnis an, auf dem die Distribution zu
 finden ist.
-(Das Verzeichnis muss .tgz Dateien enthalten und über NFS mountbar sein.)
+(Das Verzeichnis muss $0 Dateien enthalten und über NFS mountbar sein.)
 
 }
 
@@ -533,13 +540,28 @@
 
 }
 
+/* Called with:                        Example
+ *  $0 = sets suffix                   .tgz
+ */
 message cdromsource
 {Geben Sie das CD-Laufwerk und das entsprechende Verzeichnis an, in dem
 die Distribution zu finden ist.
-(Das Verzeichnis muss .tgz Dateien enthalten.)
+(Das Verzeichnis muss $0 Dateien enthalten.)
 
 }
 
+message No_cd_found
+{Kein CD Laufwerk enthält eine CD mit den Distributions-Dateien!  
+Geben Sie die korrekten Daten manuel ein, oder legen Sie eine CD
+ein und versuchen Sie es erneut. 
+}
+
+message abort_install
+{Installation abbrechen}
+
+message source_sel_retry
+{Zurück zur Quellauswahl}
+
 message Available_cds
 {Verfügbare CDs}
 
@@ -550,17 +572,23 @@
 {Die Installationsdateien wurden auf der ausgewählten CD nicht gefunden. Bitte
 prüfen Sie den Gerätenamen und Pfad der Installationsdateien.}
 
+/* Called with:                        Example
+ *  $0 = sets suffix                   .tgz
+ */
 message localfssource
 {Geben Sie das noch nicht gemountete lokale Gerät und dessen entsprechendes
 Verzeichnis an, in dem die Distribution zu finden ist.
-(Das Verzeichnis muss .tgz Dateien enthalten.)
+(Das Verzeichnis muss $0 Dateien enthalten.)
 
 }
 
+/* Called with:                        Example
+ *  $0 = sets suffix                   .tgz
+ */
 message localdir
 {Geben Sie das Verzeichnis des bereits gemounteten lokalen Geräts an, in dem
 die Distribution zu finden ist.
-(Das Verzeichnis muss .tgz Dateien enthalten.)
+(Das Verzeichnis muss $0 Dateien enthalten.)
 
 }
 
diff -r 3b60b3807ddc -r 317a538a1e56 usr.sbin/sysinst/msg.mi.en
--- a/usr.sbin/sysinst/msg.mi.en        Wed Nov 04 13:33:10 2020 +0000
+++ b/usr.sbin/sysinst/msg.mi.en        Thu Nov 05 08:10:21 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msg.mi.en,v 1.19.2.9 2020/10/15 19:36:51 bouyer Exp $  */
+/*     $NetBSD: msg.mi.en,v 1.19.2.10 2020/11/05 08:10:21 sborrill Exp $       */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -487,8 +487,12 @@
 group of sets (Custom installation).
 }
 
+/* Called with:                        Example
+ *  $0 = sets suffix                   .tgz
+ *  $1 = URL protocol used             ftp
+ */
 message ftpsource
-{The following are the %s site, directory, user, and password that
+{The following are the $1 site, directory, user, and password that
 will be used.  If "user" is "ftp", then the password is not needed.
 
 }
@@ -499,9 +503,12 @@
 message dev
 {device}
 
+/* Called with:                        Example
+ *  $0 = sets suffix                   .tgz
+ */
 message nfssource
 {Enter the nfs host and server directory where the distribution is located. 
-Remember, the directory should contain the .tgz files and
+Remember, the directory should contain the $0 files and
 must be nfs mountable.
 
 }
@@ -512,13 +519,27 @@
 
 }
 
+/* Called with:                        Example
+ *  $0 = sets suffix                   .tgz
+ */
 message cdromsource
 {Enter the CDROM device to be used and directory on the CDROM where
 the distribution is located. 
-Remember, the directory should contain the .tgz files.
+Remember, the directory should contain the $0 files.
 
 }
 
+message No_cd_found
+{Could not locate a CD medium in any drive with the distribution sets! 
+Enter the correct data manually, or insert a disk and retry. 
+}
+
+message abort_install
+{Cancel installation}
+
+message source_sel_retry
+{Back to source selection & retry}
+
 message Available_cds
 {Available CDs }
 
@@ -529,16 +550,22 @@
 {The installation sets have not been found at the default location on this
 CD.  Please check the device and path name.}
 
+/* Called with:                        Example
+ *  $0 = sets suffix                   .tgz
+ */
 message localfssource
 {Enter the unmounted local device and directory on that device where
 the distribution is located. 
-Remember, the directory should contain the .tgz files.
+Remember, the directory should contain the $0 files.
 
 }
 
+/* Called with:                        Example
+ *  $0 = sets suffix                   .tgz
+ */
 message localdir
 {Enter the already-mounted local directory where the distribution is located. 
-Remember, the directory should contain the .tgz files.
+Remember, the directory should contain the $0 files.
 
 }
 
diff -r 3b60b3807ddc -r 317a538a1e56 usr.sbin/sysinst/msg.mi.es
--- a/usr.sbin/sysinst/msg.mi.es        Wed Nov 04 13:33:10 2020 +0000
+++ b/usr.sbin/sysinst/msg.mi.es        Thu Nov 05 08:10:21 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msg.mi.es,v 1.14.2.8 2020/10/15 19:36:51 bouyer Exp $  */
+/*     $NetBSD: msg.mi.es,v 1.14.2.9 2020/11/05 08:10:21 sborrill Exp $        */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -502,8 +502,12 @@
 seleccionar de entre los conjuntos de distribución opcionales.
 }
 
+/* Called with:                        Example
+ *  $0 = sets suffix                   .tgz
+ *  $1 = URL protocol used             ftp
+ */
 message ftpsource
-{Lo siguiente son el sitio %s, directorio, usuario y contraseña que se
+{Lo siguiente son el sitio $1, directorio, usuario y contraseña que se
 usarán.  Si «usuario» es «ftp», no se necesita contraseña..
 
 }
@@ -514,9 +518,12 @@
 message dev
 {dispositivo}
 
+/* Called with:                        Example
+ *  $0 = sets suffix                   .tgz
+ */
 message nfssource
 {Introduzca el servidor nfs y el directorio del servidor donde se encuentre
-la distribución.  Recuerde: el directorio debe contener los archivos .tgz y
+la distribución.  Recuerde: el directorio debe contener los archivos $0 y
 debe ser montable por nfs.
 
 }
@@ -528,13 +535,27 @@
 
 }
 
+/* Called with:                        Example
+ *  $0 = sets suffix                   .tgz
+ */
 message cdromsource
 {Introduzca el dispositivo de CDROM a usar y el directorio del CDROM
 donde se encuentre la distribución.
-Recuerde, el directorio debe contener los archivos .tgz.
+Recuerde, el directorio debe contener los archivos $0.



Home | Main Index | Thread Index | Old Index