 @@ -1,14 +1,14 @@
-/*	$NetBSD: disks.c,v 1.123 2012/01/09 01:51:47 riz Exp $ */
+/*	$NetBSD: disks.c,v 1.124 2012/05/21 22:38:26 jdf Exp $ */
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Written by Philip A. Nelson for Piermont Information Systems Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -795,28 +795,32 @@ static int
 foundffs(struct data *list, size_t num)
+{
 	int error;
 	if (num < 2 || strcmp(list[1].u.s_val, "/") == 0 ||
 	    strstr(list[2].u.s_val, "noauto") != NULL)
 		return 0;
 	error = fsck_preen(list[0].u.s_val, ' '-'a', "ffs");
 	if (error != 0)
 		return error;
 	error = target_mount("", list[0].u.s_val, ' '-'a', list[1].u.s_val);
-	if (error != 0)
+	if (error != 0) {
-		return error;
+		msg_display(MSG_mount_failed, list[0].u.s_val);
 		process_menu(MENU_noyes, NULL);
 		if (!yesno)
 			return error;
+	}
 	return 0;
+}
 #ifdef USE_SYSVBFS
 static int
 /*ARGSUSED*/
 foundsysvbfs(struct data *list, size_t num)
+{
 	int error;
 	if (num < 2 || strcmp(list[1].u.s_val, "/") == 0 ||
 	    strstr(list[2].u.s_val, "noauto") != NULL)
 		return 0;
 @@ -844,27 +848,29 @@ fsck_preen(const char *disk, int ptn, co
 		return 0;
 	/* first, check if fsck program exists, if not, assume ok */
 	asprintf(&prog, "/sbin/fsck_%s", fsname);
 	if (prog == NULL)
 		return 0;
 	if (access(prog, X_OK) != 0)
 		return 0;
 	if (!strcmp(fsname,"ffs"))
 		fixsb(prog, disk, ptn);
 	error = run_program(0, "%s -p -q /dev/r%s%c", prog, disk, ptn);
 	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;
+}
 /* This performs the same function as the etc/rc.d/fixsb script
  * which attempts to correct problems with ffs1 filesystems
  * which may have been introduced by booting a netbsd-current kernel
  * from between April of 2003 and January 2004. For more information
  * This script was developed as a response to NetBSD pr install/25138
  * Additional prs regarding the original issue include:
  *  bin/17910 kern/21283 kern/21404 port-macppc/23925 port-macppc/23926
  */
 @@ -956,45 +962,45 @@ mount_disks(void)
 		{"/dev/", "/dev/%s %s sysvbfs %s", "c", NULL, 0, 0,
 		    foundsysvbfs},
 #endif
 	};
 	static size_t numfstabbuf = sizeof(fstabbuf) / sizeof(struct lookfor);
 	/* First the root device. */
 	if (target_already_root())
 		/* avoid needing to call target_already_root() again */
 		targetroot_mnt[0] = 0;
 	else {
 		error = mount_root();
 		if (error != 0 && error != EBUSY)
-			return 0;
+			return -1;
+	}
 	/* Check the target /etc/fstab exists before trying to parse it. */
 	if (target_dir_exists_p("/etc") == 0 ||
 	    target_file_exists_p("/etc/fstab") == 0) {
 		msg_display(MSG_noetcfstab, diskdev);
 		process_menu(MENU_ok, NULL);
-		return 0;
+		return -1;
+	}
 	/* Get fstab entries from the target-root /etc/fstab. */
 	fstabsize = target_collect_file(T_FILE, &fstab, "/etc/fstab");
 	if (fstabsize < 0) {
 		/* 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);
 	return error;
+}
 int
 set_swap(const char *disk, partinfo *pp)
+{
 	int i;
 	char *cp;
 	int rval;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: msg.mi.de,v 1.67 2012/04/30 19:49:26 martin Exp $	*/
+/*	$NetBSD: msg.mi.de,v 1.68 2012/05/21 22:38:25 jdf Exp $	*/
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Written by Philip A. Nelson for Piermont Information Systems Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -114,26 +114,29 @@ auf eine vorbereitete Festplatte ausgepa
 die Sets auf eine im Vorfeld partitionierte und bootf�hige Festplatte aus.
 Es werden weder Festplatten gelabelt, Bootbl�cke aktualisiert noch bestehende
 Konfigurationen gesichert.
 Beenden Sie jetzt und w�hlen Sie dann 'Installation' oder 'Aktualisierung',
 falls Ihre Festplatte nicht entsprechend vorbereitet ist oder Sie das System
 neu installieren oder aber ein bestehendes aktualisieren m�chten!
 Wollen Sie die NetBSD Distributionssets wirklich erneut installieren?
 (Dies ist die letzte Warnung, bevor die Inhalte Ihres Dateisystems
 �berschrieben werden!)
+}
 message mount_failed
 {Versuch, %s zu mounten ist fehlgeschlagen. Fortfahren?
+}
 message nodisk
 {Ich kann keine f�r NetBSD nutzbaren Festplatten finden.
 Zur�ck zum Hauptmen�...
+}
 message onedisk
 {Ich habe nur eine Festplatte, %s, gefunden. Ich gehe somit davon aus, dass
 Sie NetBSD darauf %s m�chten.
+}
 message ask_disk
 {Auf welcher Festplatte m�chten Sie NetBSD %s? }
 @@ -701,29 +704,29 @@ Netzwerkkonfiguration �berarbeiten?
+}
 message netnotup_continueanyway
 {Wollen Sie die Installation dennoch fortsetzen? Sie k�nnen sich auch
 sp�ter um das Netzwerk k�mmern. ("Nein" bricht die Installation ab.)
+}
 message makedev
 {Erstelle Ger�tedateien in /dev ...
+}
 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
 {Das Zielverzeichnis %s existiert nicht.
+}
 message badroot
 {Das neu installierte root Dateisystem scheint unvollst�ndig zu sein.
 Sind Sie sicher, dass Sie alle ben�tigten Sets installiert haben?
+}
 message fd_type
 {Floppy Dateisystem-Typ}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: msg.mi.en,v 1.172 2012/04/06 23:48:53 riz Exp $	*/
+/*	$NetBSD: msg.mi.en,v 1.173 2012/05/21 22:38:25 jdf Exp $	*/
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Written by Philip A. Nelson for Piermont Information Systems Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -107,26 +107,29 @@ disks.)
 message reinstallusure
 {Ok, let's unpack the NetBSD distribution sets to a bootable hard disk.
 This procedure just fetches and unpacks sets onto an pre-partitioned
 bootable disk. It does not label disks, upgrade bootblocks, or save
 any existing configuration info.  (Quit and choose `install' or
 `upgrade' if you want those options.)  You should have already done an
 `install' or `upgrade' before starting this procedure!
 Do you really want to reinstall NetBSD distribution sets?
 (This is your last warning before this procedure starts modifying your
 disks.)
+}
 message mount_failed
 {Mounting %s failed. Continue?
+}
 message nodisk
 {I can not find any hard disks for use by NetBSD.  You will be
 returned to the original menu.
+}
 message onedisk
 {I found only one disk, %s.
 Therefore I assume you want to %s NetBSD on it.
+}
 message ask_disk
 {On which disk do you want to %s NetBSD? }
 @@ -670,27 +673,27 @@ or abort the install process.)
+}
 message netnotup_continueanyway
 {Would you like to continue the install process anyway, and assume
 that the network is working?  (No aborts the install process.)
+}
 message makedev
 {Making device nodes ...
+}
 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
 { target root is missing %s.
+}
 message badroot
 {The completed new root file system failed a basic sanity check.
  Are you sure you installed all the required sets?
+}
 message fd_type
 {Floppy file system type}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: msg.mi.es,v 1.43 2012/04/06 23:48:53 riz Exp $	*/
+/*	$NetBSD: msg.mi.es,v 1.44 2012/05/21 22:38:25 jdf Exp $	*/
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Written by Philip A. Nelson for Piermont Information Systems Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -114,26 +114,29 @@ message reinstallusure
 {Se va a desempaquetar los conjuntos de distribuci�n de NetBSD
 a un disco duro marcado como arrancable.  Este procedimiento solamente
 descarga y desempaqueta los conjuntos en un disco arrancable preparticionado.
 No pone nombre a los discos, ni actualiza los bloques de arranque, ni guarda
 ninguna informaci�n de configuraci�n.  (Salga y escoja `instalar' o
 `actualizar' si quiere esas opciones.)  �Ya deber�a haber hecho un
 `instalar' o `actualizar' antes de iniciar este procedimiento!
 �Realmente quiere reinstalar los conjuntos de la distribuci�n NetBSD?
 (�ste es su �ltimo aviso antes de que el programa empiece a modificar
 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.
 Se le volver� a llevar al men� original.
+}
 message onedisk
 {Solamente se ha encontrado un disco, %s.
 Por tanto se entiende que quiere %s NetBSD en �l.
+}
 message ask_disk
 {�En cu�l disco quiere %s NetBSD? }
 @@ -691,27 +694,27 @@ proceso de instalaci�n.)
 message netnotup_continueanyway
 {�Le gustar�a continuar el proceso de instalaci�n de todos modos, y
 suponer que la red est� funcionando?  (�No� interrumpe el proceso de
 instalaci�n.)
+}
 message makedev
 {Creando nodos de dispositivo ...
+}
 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
 { el directorio ra�z objetivo no existe %s.
+}
 message badroot
 {El nuevo sistema de archivos ra�z no ha pasado la comprobaci�n b�sica.
  �Est� seguro de que ha instalado todos los conjuntos requeridos?
+}
 message fd_type

 @@ -1,14 +1,14 @@
-/*	$NetBSD: msg.mi.pl,v 1.83 2012/04/06 23:48:53 riz Exp $	*/
+/*	$NetBSD: msg.mi.pl,v 1.84 2012/05/21 22:38:26 jdf Exp $	*/
 /*	Based on english version: */
 /*	NetBSD: msg.mi.pl,v 1.36 2004/04/17 18:55:35 atatat Exp       */
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Written by Philip A. Nelson for Piermont Information Systems Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -111,26 +111,30 @@ twoich dyskach.)
 message reinstallusure
 {Ok, rozpakujmy pakiety dystrybucyjne NetBSD na bootowalny twardy dysk.
 Ta procedura tylko sciaga i rozpakowuje pakiety na pre-partycjonowany
 bootowalny dysk. Nie nazywa dyskow, aktualizuje bootblokow, lub zapisuje
 istniejacej konfiguracji.   (Wyjdz i wybierz `instaluj' lub
 `aktualizuj' jesli chcesz to zrobic.) Powinienes wykonac `instaluj' lub
 `aktualizuj' przed rozpoczeciem tej procedury!
 Czy napewno chcesz przeinstalowac pakiety dystrybucjne NetBSD?
 (Jest to ostatnie ostrzezenie zanim zacznie sie modyfikacja danych na
 twoich dyskach.)
+}
 message mount_failed
 {Mounting %s failed. Continue?
+}
 /* XXX: Translate. */
 message nodisk
 {Nie moge znalezc zadnych twardych dyskow do uzycia z NetBSD. Zostaniesz
 przeniesiony do menu glownego.
+}
 message onedisk
 {Znalazlem tylko jeden dysk, %s.  Stad przyjmuje, ze chcesz %s
 NetBSD wlasnie na nim.
+}
 message ask_disk
 {Na ktorym z nich chcesz %s NetBSD? }
 @@ -665,26 +669,30 @@ message netnotup
 albo serwer nazw nie byl osiagalny przez ping. Czy chcesz skonfigurowac
 siec jeszcze raz? (Nie pozwala ci kontynuowac lub przerwac instalacje.)
+}
 message netnotup_continueanyway
 {Czy chcesz kontynuowac proces instalacji i zalozyc, ze twoja siec dziala?
 (Nie przerywa procesu instalacji.)
+}
 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.)
+}
 message rootmissing
 { docelowy / jest zagubiony %s.
+}
 message badroot
 {Kompletny nowy system plikow nie przeszedl podstawowych testow.
  Jestes pewien, ze zainstalowales wszystkie wymagane pakiety?
+}

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: msg.mi.fr,v 1.126 2012/04/08 03:11:14 uebayasi Exp $ */	1	/* $NetBSD: msg.mi.fr,v 1.127 2012/05/21 22:38:26 jdf Exp $ */
2		2
3	/*	3	/*
4	* Copyright 1997 Piermont Information Systems Inc.	4	* Copyright 1997 Piermont Information Systems Inc.
5	* All rights reserved.	5	* All rights reserved.
6	*	6	*
7	* Written by Philip A. Nelson for Piermont Information Systems Inc.	7	* Written by Philip A. Nelson for Piermont Information Systems Inc.
8	*	8	*
9	* Redistribution and use in source and binary forms, with or without	9	* Redistribution and use in source and binary forms, with or without
10	* modification, are permitted provided that the following conditions	10	* modification, are permitted provided that the following conditions
11	* are met:	11	* are met:
12	* 1. Redistributions of source code must retain the above copyright	12	* 1. Redistributions of source code must retain the above copyright
13	* notice, this list of conditions and the following disclaimer.	13	* notice, this list of conditions and the following disclaimer.
14	* 2. Redistributions in binary form must reproduce the above copyright	14	* 2. Redistributions in binary form must reproduce the above copyright
	@@ -117,26 +117,30 @@ Cette proc�dure va rapatrier et d�compre		@@ -117,26 +117,30 @@ Cette proc�dure va rapatrier et d�compre
117	sur un disque d�marrable d�j� partitionnn�.	117	sur un disque d�marrable d�j� partitionnn�.
118	Elle n'inscrit pas de "label" sur le disque,	118	Elle n'inscrit pas de "label" sur le disque,
119	n'installe pas de nouveaux secteurs d'amor�age et ne modifie	119	n'installe pas de nouveaux secteurs d'amor�age et ne modifie
120	pas les fichiers de configuration existants	120	pas les fichiers de configuration existants
121	(Quittez et choisissez `installer' ou `mettre � jour').	121	(Quittez et choisissez `installer' ou `mettre � jour').
122	Vous devriez d�j� avoir fait une installation	122	Vous devriez d�j� avoir fait une installation
123	ou une mise � jour avant de d�marrer cette proc�dure !	123	ou une mise � jour avant de d�marrer cette proc�dure !
124		124
125	Voulez-vous r�ellement r�installer les composants NetBSD ?	125	Voulez-vous r�ellement r�installer les composants NetBSD ?
126	(Ceci est le dernier avertissement avant que cette proc�dure ne commence �	126	(Ceci est le dernier avertissement avant que cette proc�dure ne commence �
127	modifier vos disques).	127	modifier vos disques).
128	}	128	}
129		129
		130	message mount_failed
		131	{Le montage du syst�me de fichiers %s a �chou�. Continuer ?
		132	}
		133
130	message nodisk	134	message nodisk
131	{Aucun disque utilisable par NetBSD n'a �t� trouv�.	135	{Aucun disque utilisable par NetBSD n'a �t� trouv�.
132	Retour au menu pr�c�dent.	136	Retour au menu pr�c�dent.
133	}	137	}
134		138
135	message onedisk	139	message onedisk
136	{Un seul disque a �t� trouv� : %s. Nous supposons que vous souhaitez	140	{Un seul disque a �t� trouv� : %s. Nous supposons que vous souhaitez
137	%s NetBSD sur ce dernier.	141	%s NetBSD sur ce dernier.
138	}	142	}
139		143
140	message ask_disk	144	message ask_disk
141	{Sur quel disque voulez-vous %s NetBSD ?}	145	{Sur quel disque voulez-vous %s NetBSD ?}
142		146
	@@ -738,29 +742,29 @@ message netnotup_continueanyway		@@ -738,29 +742,29 @@ message netnotup_continueanyway
738	{	742	{
739	Souhaitez-vous poursuivre malgr� tout le processus d'installation	743	Souhaitez-vous poursuivre malgr� tout le processus d'installation
740	et supposer que le r�seau fonctionne correctement ?	744	et supposer que le r�seau fonctionne correctement ?
741	(un refus provoquera l'arr�t de la proc�dure d'installation)	745	(un refus provoquera l'arr�t de la proc�dure d'installation)
742	}	746	}
743		747
744	message makedev	748	message makedev
745	{Cr�ation des fichiers des p�riph�riques ...	749	{Cr�ation des fichiers des p�riph�riques ...
746	}	750	}
747		751
748	message badfs	752	message badfs
749	{	753	{
750	/dev/%s%c ne semble pas �tre un syst�me de fichiers BSD, ou	754	/dev/%s%c ne semble pas �tre un syst�me de fichiers BSD, ou
751	la v�rification de son int�grit� par fsck a �chou�.	755	la v�rification de son int�grit� par fsck a �chou�, code d'erreur %d.
752		756
753	Interruption de la proc�dure de mise � jour, code d'erreur %d.	757	Souhaitez-vous continuer mise � jour?
754	}	758	}
755		759
756	message rootmissing	760	message rootmissing
757	{	761	{
758	Impossible de trouver la racine du disque cible %s.	762	Impossible de trouver la racine du disque cible %s.
759	}	763	}
760		764
761	message badroot	765	message badroot
762	{	766	{
763	La v�rification de l'int�grit� du nouveau syst�me de fichiers a �chou�.	767	La v�rification de l'int�grit� du nouveau syst�me de fichiers a �chou�.
764	Avez-vous bien install� tous les composants indispensables ?	768	Avez-vous bien install� tous les composants indispensables ?
765	}	769	}
766		770