Module Name: src
Committed By: jmcneill
Date: Sun Aug 23 21:16:17 UTC 2009
Modified Files:
src/distrib/utils/sysinst: menus.mi msg.mi.de msg.mi.en msg.mi.es
msg.mi.fr msg.mi.pl util.c
Log Message:
Get rid of the 'select extraction verbosity' menu.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/distrib/utils/sysinst/menus.mi
cvs rdiff -u -r1.49 -r1.50 src/distrib/utils/sysinst/msg.mi.de
cvs rdiff -u -r1.157 -r1.158 src/distrib/utils/sysinst/msg.mi.en \
src/distrib/utils/sysinst/util.c
cvs rdiff -u -r1.26 -r1.27 src/distrib/utils/sysinst/msg.mi.es
cvs rdiff -u -r1.106 -r1.107 src/distrib/utils/sysinst/msg.mi.fr
cvs rdiff -u -r1.65 -r1.66 src/distrib/utils/sysinst/msg.mi.pl
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.35 src/distrib/utils/sysinst/menus.mi:1.36
--- src/distrib/utils/sysinst/menus.mi:1.35 Fri Feb 27 22:51:33 2009
+++ src/distrib/utils/sysinst/menus.mi Sun Aug 23 21:16:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: menus.mi,v 1.35 2009/02/27 22:51:33 hubertf Exp $ */
+/* $NetBSD: menus.mi,v 1.36 2009/08/23 21:16:16 jmcneill Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -371,9 +371,3 @@
option "/bin/sh", exit, action {*(const char **)arg = "/bin/sh";};
option "/bin/ksh", exit, action {*(const char **)arg = "/bin/ksh";};
option "/bin/csh", exit, action {*(const char **)arg = "/bin/csh";};
-
-menu extract, title MSG_Select_set_extraction_verbosity;
- display action { menu->cursel = *(int *)arg; };
- option MSG_Progress_bar, exit, action { *(int *)arg = 0; };
- option MSG_Silent, exit, action { *(int *)arg = 1; };
- option MSG_Verbose, exit, action { *(int *)arg = 2; };
Index: src/distrib/utils/sysinst/msg.mi.de
diff -u src/distrib/utils/sysinst/msg.mi.de:1.49 src/distrib/utils/sysinst/msg.mi.de:1.50
--- src/distrib/utils/sysinst/msg.mi.de:1.49 Thu May 14 16:23:38 2009
+++ src/distrib/utils/sysinst/msg.mi.de Sun Aug 23 21:16:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.de,v 1.49 2009/05/14 16:23:38 sborrill Exp $ */
+/* $NetBSD: msg.mi.de,v 1.50 2009/08/23 21:16:16 jmcneill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -616,12 +616,6 @@
message delete_xfer_file
{Nach der Installation löschen}
-message verboseextract
-{
-Im nächsten Schritt werden nun die Distributionssets (Basissystem + Kernel)
-geladen und auf die Festplatte kopiert.
-}
-
message notarfile
{Das Release-Paket %s existiert nicht.}
@@ -1004,10 +998,6 @@
message Perform_IPv6_autoconfiguration {IPv6 automatisch konfigurieren?}
message Perform_DHCP_autoconfiguration {Konfiguration per DHCP ermitteln?}
message Root_shell {Root-Shell}
-message Select_set_extraction_verbosity {Bitte wählen Sie die Fortschrittsanzeige während des Extrahierens}
-message Progress_bar {Fortschrittsbalken (empfohlen)}
-message Silent {Keine (schnell)}
-message Verbose {Alle installierten Dateien anzeigen (langsam))}
.if AOUT2ELF
message aoutfail
Index: src/distrib/utils/sysinst/msg.mi.en
diff -u src/distrib/utils/sysinst/msg.mi.en:1.157 src/distrib/utils/sysinst/msg.mi.en:1.158
--- src/distrib/utils/sysinst/msg.mi.en:1.157 Sun Aug 23 20:58:05 2009
+++ src/distrib/utils/sysinst/msg.mi.en Sun Aug 23 21:16:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.en,v 1.157 2009/08/23 20:58:05 jmcneill Exp $ */
+/* $NetBSD: msg.mi.en,v 1.158 2009/08/23 21:16:17 jmcneill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -594,14 +594,6 @@
message delete_xfer_file
{Delete after install}
-message verboseextract
-{
-The next step is to fetch and unpack the distribution filesets.
-
-During the extraction process, what do you want to see as
-each file is extracted?
-}
-
message notarfile
{Release set %s does not exist.}
@@ -948,10 +940,6 @@
message Perform_IPv6_autoconfiguration {Perform IPv6 autoconfiguration?}
message Perform_DHCP_autoconfiguration {Perform DHCP autoconfiguration?}
message Root_shell {Root shell}
-message Select_set_extraction_verbosity {Select set extraction verbosity}
-message Progress_bar {Progress bar (recommended)}
-message Silent {Silent}
-message Verbose {Verbose file name listing (slow)}
.if AOUT2ELF
message aoutfail
Index: src/distrib/utils/sysinst/util.c
diff -u src/distrib/utils/sysinst/util.c:1.157 src/distrib/utils/sysinst/util.c:1.158
--- src/distrib/utils/sysinst/util.c:1.157 Sat Apr 4 11:24:24 2009
+++ src/distrib/utils/sysinst/util.c Sun Aug 23 21:16:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.157 2009/04/04 11:24:24 ad Exp $ */
+/* $NetBSD: util.c,v 1.158 2009/08/23 21:16:17 jmcneill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -607,23 +607,6 @@
free_menu(menu_no);
}
-static int
-ask_verbose_dist(msg setup_done)
-{
- int verbose = 0;
-
- wclear(stdscr);
- wrefresh(stdscr);
- if (setup_done != NULL)
- msg_display(setup_done);
- msg_display_add(MSG_verboseextract);
- process_menu(MENU_extract, &verbose);
- wclear(stdscr);
- wrefresh(stdscr);
-
- return verbose;
-}
-
/*
* Extract_file **REQUIRES** an absolute path in ext_dir. Any code
* that sets up xfer_dir for use by extract_file needs to put in the
@@ -631,7 +614,7 @@
*/
static int
-extract_file(distinfo *dist, int update, int verbose)
+extract_file(distinfo *dist, int update)
{
char path[STRSIZE];
char *owd;
@@ -685,15 +668,8 @@
target_chdir_or_die("/");
/* now extract set files into "./". */
- if (verbose == 0)
- rval = run_program(RUN_DISPLAY | RUN_PROGRESS,
- "progress -zf %s tar --chroot -xhepf -", path);
- else if (verbose == 1)
- rval = run_program(RUN_DISPLAY,
- "tar --chroot -zxhepf %s", path);
- else
- rval = run_program(RUN_DISPLAY | RUN_PROGRESS,
- "tar --chroot -zxhvepf %s", path);
+ rval = run_program(RUN_DISPLAY | RUN_PROGRESS,
+ "progress -zf %s tar --chroot -xhepf -", path);
chdir(owd);
free(owd);
@@ -765,7 +741,6 @@
{
distinfo *dist;
int status;
- int verbose;
int set;
/* Ensure mountpoint for distribution files exists in current root. */
@@ -778,9 +753,6 @@
/* Find out which files to "get" if we get files. */
- /* ask user whether to do normal or verbose extraction */
- verbose = ask_verbose_dist(setupdone_msg);
-
/* Accurately count selected sets */
for (dist = dist_list; (set = dist->set) != SET_LAST; dist++) {
if ((set_status[set] & (SET_VALID | SET_SELECTED))
@@ -830,7 +802,7 @@
}
/* Try to extract this set */
- status = extract_file(dist, update, verbose);
+ status = extract_file(dist, update);
if (status == SET_RETRY)
dist--;
}
Index: src/distrib/utils/sysinst/msg.mi.es
diff -u src/distrib/utils/sysinst/msg.mi.es:1.26 src/distrib/utils/sysinst/msg.mi.es:1.27
--- src/distrib/utils/sysinst/msg.mi.es:1.26 Thu May 14 16:23:38 2009
+++ src/distrib/utils/sysinst/msg.mi.es Sun Aug 23 21:16:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.es,v 1.26 2009/05/14 16:23:38 sborrill Exp $ */
+/* $NetBSD: msg.mi.es,v 1.27 2009/08/23 21:16:17 jmcneill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -609,15 +609,6 @@
message delete_xfer_file
{A eliminar después de la instalación}
-message verboseextract
-{
-El siguiente paso es descargar y desempaquetar los conjuntos de
-ficheros de la distribución.
-
-Durante el proceso de extracción, ¿qué desea ver según se vaya
-extrayendo cada uno de los ficheros?
-}
-
message notarfile
{El conjunto %s no existe.}
@@ -975,10 +966,6 @@
message Perform_IPv6_autoconfiguration {¿Realizar autoconfiguración IPv6?}
message Perform_DHCP_autoconfiguration {¿Realizar autoconfiguración DHCP ?}
message Root_shell {Shell de root}
-message Select_set_extraction_verbosity {Seleccione la prolijidad de la extracción de conjuntos}
-message Progress_bar {Barra de progreso (recomendado)}
-message Silent {Silencioso}
-message Verbose {Listado de nombres de ficheros detallado (lento)}
.if AOUT2ELF
message aoutfail
Index: src/distrib/utils/sysinst/msg.mi.fr
diff -u src/distrib/utils/sysinst/msg.mi.fr:1.106 src/distrib/utils/sysinst/msg.mi.fr:1.107
--- src/distrib/utils/sysinst/msg.mi.fr:1.106 Thu May 14 16:23:38 2009
+++ src/distrib/utils/sysinst/msg.mi.fr Sun Aug 23 21:16:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.fr,v 1.106 2009/05/14 16:23:38 sborrill Exp $ */
+/* $NetBSD: msg.mi.fr,v 1.107 2009/08/23 21:16:17 jmcneill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -619,15 +619,6 @@
Effacer après l'installation
}
-message verboseextract
-{
-L'étape suivante consiste à installer les composants de
-NetBSD.
-
-Souhaitez-vous voir s'afficher les noms de fichiers au fur et
-à mesure de leur installation ?
-}
-
message notarfile
{Le composant %s n'existe pas.}
@@ -1039,10 +1030,6 @@
message Perform_IPv6_autoconfiguration {Configurer automatiquement l'IPv6 ?}
message Perform_DHCP_autoconfiguration {Configurer automatiquement via DHCP ?}
message Root_shell {Shell du compte root}
-message Select_set_extraction_verbosity {Degré d'information lors des extractions ?}
-message Progress_bar {Barre de progression (recommendeé)}
-message Silent {Silencieux}
-message Verbose {Détails maximum d'extraction (plus lent)}
.if AOUT2ELF
message aoutfail
Index: src/distrib/utils/sysinst/msg.mi.pl
diff -u src/distrib/utils/sysinst/msg.mi.pl:1.65 src/distrib/utils/sysinst/msg.mi.pl:1.66
--- src/distrib/utils/sysinst/msg.mi.pl:1.65 Thu May 14 16:23:38 2009
+++ src/distrib/utils/sysinst/msg.mi.pl Sun Aug 23 21:16:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.pl,v 1.65 2009/05/14 16:23:38 sborrill Exp $ */
+/* $NetBSD: msg.mi.pl,v 1.66 2009/08/23 21:16:17 jmcneill Exp $ */
/* Based on english version: */
/* NetBSD: msg.mi.pl,v 1.36 2004/04/17 18:55:35 atatat Exp */
@@ -592,14 +592,6 @@
message delete_xfer_file
{Usun po zakonczeniu instalacji}
-message verboseextract
-{
-Kolejny krok to sciagniecie i rozpakowanie pakietow dystrybucji.
-
-Czy w trakcie rozpakowywania plikow, chcesz widziec nazwe aktualnie
-wypakowywanego pliku ?
-}
-
message notarfile
{Pakiet %s nie istnieje.}
@@ -941,10 +933,6 @@
message Perform_IPv6_autoconfiguration {Wykonac autokonfiguracje IPv6?}
message Perform_DHCP_autoconfiguration {Wykonac autkonfiguracje DHCP?}
message Root_shell {Powloka root'a}
-message Select_set_extraction_verbosity {Wybierz gadatliwosc procesu rozpakowywania pakietow}
-message Progress_bar {Pasek postepu (zalecany)}
-message Silent {Cichy}
-message Verbose {Lista plikow (wolne)}
.if AOUT2ELF
message aoutfail
