Module Name: src
Committed By: riz
Date: Thu Jul 5 17:29:16 UTC 2012
Modified Files:
src/distrib/utils/sysinst [netbsd-6]: disks.c msg.mi.de msg.mi.en
msg.mi.es msg.mi.fr msg.mi.pl
Log Message:
Pull up following revision(s) (requested by jdf in ticket #393):
distrib/utils/sysinst/msg.mi.de: revision 1.68
distrib/utils/sysinst/msg.mi.fr: revision 1.127
distrib/utils/sysinst/msg.mi.en: revision 1.173
distrib/utils/sysinst/disks.c: revision 1.124
distrib/utils/sysinst/msg.mi.pl: revision 1.84
distrib/utils/sysinst/msg.mi.es: revision 1.44
Changed returncodes to -1 of mount_disks in case of error (before, they were
inverted).
Add message mount_failed to be displayed when a mount fails, offering the
opportunity to go on anyway (fix for PR install/12020).
To generate a diff of this commit:
cvs rdiff -u -r1.123.2.1 -r1.123.2.2 src/distrib/utils/sysinst/disks.c
cvs rdiff -u -r1.61.2.1 -r1.61.2.2 src/distrib/utils/sysinst/msg.mi.de
cvs rdiff -u -r1.169.2.1 -r1.169.2.2 src/distrib/utils/sysinst/msg.mi.en
cvs rdiff -u -r1.39.2.1 -r1.39.2.2 src/distrib/utils/sysinst/msg.mi.es
cvs rdiff -u -r1.119.2.1 -r1.119.2.2 src/distrib/utils/sysinst/msg.mi.fr
cvs rdiff -u -r1.78.2.1 -r1.78.2.2 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/disks.c
diff -u src/distrib/utils/sysinst/disks.c:1.123.2.1 src/distrib/utils/sysinst/disks.c:1.123.2.2
--- src/distrib/utils/sysinst/disks.c:1.123.2.1 Wed Jul 4 20:48:55 2012
+++ src/distrib/utils/sysinst/disks.c Thu Jul 5 17:29:15 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.123.2.1 2012/07/04 20:48:55 jdc Exp $ */
+/* $NetBSD: disks.c,v 1.123.2.2 2012/07/05 17:29:15 riz Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -849,8 +849,12 @@ foundffs(struct data *list, size_t num)
return error;
error = target_mount("", list[0].u.s_val, ' '-'a', list[1].u.s_val);
- if (error != 0)
- return error;
+ if (error != 0) {
+ msg_display(MSG_mount_failed, list[0].u.s_val);
+ process_menu(MENU_noyes, NULL);
+ if (!yesno)
+ return error;
+ }
return 0;
}
@@ -898,7 +902,9 @@ fsck_preen(const char *disk, int ptn, co
free(prog);
if (error != 0) {
msg_display(MSG_badfs, disk, ptn, error);
- process_menu(MENU_ok, NULL);
+ process_menu(MENU_noyes, NULL);
+ if (yesno)
+ error = 0;
/* XXX at this point maybe we should run a full fsck? */
}
return error;
@@ -1010,7 +1016,7 @@ mount_disks(void)
else {
error = mount_root();
if (error != 0 && error != EBUSY)
- return 0;
+ return -1;
}
/* Check the target /etc/fstab exists before trying to parse it. */
@@ -1018,7 +1024,7 @@ mount_disks(void)
target_file_exists_p("/etc/fstab") == 0) {
msg_display(MSG_noetcfstab, diskdev);
process_menu(MENU_ok, NULL);
- return 0;
+ return -1;
}
@@ -1028,7 +1034,7 @@ mount_disks(void)
/* error ! */
msg_display(MSG_badetcfstab, diskdev);
process_menu(MENU_ok, NULL);
- return 0;
+ return -1;
}
error = walk(fstab, (size_t)fstabsize, fstabbuf, numfstabbuf);
free(fstab);
Index: src/distrib/utils/sysinst/msg.mi.de
diff -u src/distrib/utils/sysinst/msg.mi.de:1.61.2.1 src/distrib/utils/sysinst/msg.mi.de:1.61.2.2
--- src/distrib/utils/sysinst/msg.mi.de:1.61.2.1 Thu May 17 18:57:09 2012
+++ src/distrib/utils/sysinst/msg.mi.de Thu Jul 5 17:29:15 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.de,v 1.61.2.1 2012/05/17 18:57:09 sborrill Exp $ */
+/* $NetBSD: msg.mi.de,v 1.61.2.2 2012/07/05 17:29:15 riz Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -124,6 +124,9 @@ Wollen Sie die NetBSD Distributionssets
�berschrieben werden!)
}
+message mount_failed
+{Versuch, %s zu mounten ist fehlgeschlagen. Fortfahren?
+}
message nodisk
{Ich kann keine f�r NetBSD nutzbaren Festplatten finden.
@@ -711,9 +714,9 @@ message makedev
message badfs
{Das Dateisystem auf /dev/%s%c scheint kein BSD-Dateisystem zu sein,
-die Pr�fung des Dateisystems (fsck) ist fehlgeschlagen.
+die Pr�fung des Dateisystems (fsck) ist fehlgeschlagen (Fehler %d).
-Die Aktualisierung wird abgebrochen. (Fehlernummer %d.)
+Die Aktualisierung trotzdem fortsetzen?
}
message rootmissing
Index: src/distrib/utils/sysinst/msg.mi.en
diff -u src/distrib/utils/sysinst/msg.mi.en:1.169.2.1 src/distrib/utils/sysinst/msg.mi.en:1.169.2.2
--- src/distrib/utils/sysinst/msg.mi.en:1.169.2.1 Thu May 17 18:57:10 2012
+++ src/distrib/utils/sysinst/msg.mi.en Thu Jul 5 17:29:15 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.en,v 1.169.2.1 2012/05/17 18:57:10 sborrill Exp $ */
+/* $NetBSD: msg.mi.en,v 1.169.2.2 2012/07/05 17:29:15 riz Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -117,6 +117,9 @@ Do you really want to reinstall NetBSD d
disks.)
}
+message mount_failed
+{Mounting %s failed. Continue?
+}
message nodisk
{I can not find any hard disks for use by NetBSD. You will be
@@ -680,7 +683,7 @@ message makedev
message badfs
{It appears that /dev/%s%c is not a BSD file system or the fsck was
-not successful. The upgrade has been aborted. (Error number %d.)
+not successful. Try mounting it anyway? (Error number %d.)
}
message rootmissing
Index: src/distrib/utils/sysinst/msg.mi.es
diff -u src/distrib/utils/sysinst/msg.mi.es:1.39.2.1 src/distrib/utils/sysinst/msg.mi.es:1.39.2.2
--- src/distrib/utils/sysinst/msg.mi.es:1.39.2.1 Thu May 17 18:57:10 2012
+++ src/distrib/utils/sysinst/msg.mi.es Thu Jul 5 17:29:16 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.es,v 1.39.2.1 2012/05/17 18:57:10 sborrill Exp $ */
+/* $NetBSD: msg.mi.es,v 1.39.2.2 2012/07/05 17:29:16 riz Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -124,6 +124,9 @@ ninguna informaci�n de configuraci�n. (
sus discos.)
}
+message mount_failed
+{Mounting %s failed. Continue?
+}
message nodisk
{No se ha podido encontrar ning�n disco duro para ser usado por NetBSD.
@@ -701,7 +704,7 @@ message makedev
message badfs
{Parece que /dev/%s%c no es un sistema de archivos BSD o el fsck no ha sido
-correcto. La actualizaci�n ha sido interrumpida. (Error n�mero %d.)
+correcto. �Continuar? (Error n�mero %d.)
}
message rootmissing
Index: src/distrib/utils/sysinst/msg.mi.fr
diff -u src/distrib/utils/sysinst/msg.mi.fr:1.119.2.1 src/distrib/utils/sysinst/msg.mi.fr:1.119.2.2
--- src/distrib/utils/sysinst/msg.mi.fr:1.119.2.1 Thu May 17 18:57:10 2012
+++ src/distrib/utils/sysinst/msg.mi.fr Thu Jul 5 17:29:15 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.fr,v 1.119.2.1 2012/05/17 18:57:10 sborrill Exp $ */
+/* $NetBSD: msg.mi.fr,v 1.119.2.2 2012/07/05 17:29:15 riz Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -127,6 +127,10 @@ Voulez-vous r�ellement r�installer les c
modifier vos disques).
}
+message mount_failed
+{Le montage du syst�me de fichiers %s a �chou�. Continuer ?
+}
+
message nodisk
{Aucun disque utilisable par NetBSD n'a �t� trouv�.
Retour au menu pr�c�dent.
@@ -748,9 +752,9 @@ message makedev
message badfs
{
/dev/%s%c ne semble pas �tre un syst�me de fichiers BSD, ou
-la v�rification de son int�grit� par fsck a �chou�.
+la v�rification de son int�grit� par fsck a �chou�, code d'erreur %d.
-Interruption de la proc�dure de mise � jour, code d'erreur %d.
+Souhaitez-vous continuer mise � jour?
}
message rootmissing
Index: src/distrib/utils/sysinst/msg.mi.pl
diff -u src/distrib/utils/sysinst/msg.mi.pl:1.78.2.1 src/distrib/utils/sysinst/msg.mi.pl:1.78.2.2
--- src/distrib/utils/sysinst/msg.mi.pl:1.78.2.1 Thu May 17 18:57:11 2012
+++ src/distrib/utils/sysinst/msg.mi.pl Thu Jul 5 17:29:15 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.pl,v 1.78.2.1 2012/05/17 18:57:11 sborrill Exp $ */
+/* $NetBSD: msg.mi.pl,v 1.78.2.2 2012/07/05 17:29:15 riz Exp $ */
/* Based on english version: */
/* NetBSD: msg.mi.pl,v 1.36 2004/04/17 18:55:35 atatat Exp */
@@ -121,6 +121,10 @@ Czy napewno chcesz przeinstalowac pakiet
twoich dyskach.)
}
+message mount_failed
+{Mounting %s failed. Continue?
+}
+/* XXX: Translate. */
message nodisk
{Nie moge znalezc zadnych twardych dyskow do uzycia z NetBSD. Zostaniesz
@@ -675,6 +679,10 @@ message makedev
{Tworzenie plikow urzadzen ...
}
+/* XXX: Translate:
+* -not successful. The upgrade has been aborted. (Error number %d.)
+* +not successful (Error number %d.). Try mounting it anyway?
+*/
message badfs
{Wyglada na to, ze /dev/%s%c nie jest systemem plikow BSD albo nie powiodlo sie
jego sprawdzenie. Aktualizacja zostala przerwana. (Blad numer %d.)
