CVS commit: [netbsd-6] src/distrib/utils/sysinst/arch/atari

2014-12-14 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Sun Dec 14 14:14:48 UTC 2014

Modified Files:
src/distrib/utils/sysinst/arch/atari [netbsd-6]: msg.md.de msg.md.en
msg.md.es

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1210):
usr.sbin/sysinst/arch/atari/msg.md.de: revision 1.2
usr.sbin/sysinst/arch/atari/msg.md.en: revision 1.2
usr.sbin/sysinst/arch/atari/msg.md.es: revision 1.2
Terminate messages with a newline so that dialog box won't overwrite messages.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.6.1 src/distrib/utils/sysinst/arch/atari/msg.md.de
cvs rdiff -u -r1.10 -r1.10.6.1 src/distrib/utils/sysinst/arch/atari/msg.md.en
cvs rdiff -u -r1.5 -r1.5.6.1 src/distrib/utils/sysinst/arch/atari/msg.md.es

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/arch/atari/msg.md.de
diff -u src/distrib/utils/sysinst/arch/atari/msg.md.de:1.7 src/distrib/utils/sysinst/arch/atari/msg.md.de:1.7.6.1
--- src/distrib/utils/sysinst/arch/atari/msg.md.de:1.7	Mon Apr  4 08:30:19 2011
+++ src/distrib/utils/sysinst/arch/atari/msg.md.de	Sun Dec 14 14:14:48 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.md.de,v 1.7 2011/04/04 08:30:19 mbalmer Exp $	*/
+/*	$NetBSD: msg.md.de,v 1.7.6.1 2014/12/14 14:14:48 martin Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -62,7 +62,8 @@ zu nutzen. Stellen Sie die 'Id' all jene
 wollen, auf 'NBD'. Setzen Sie zusätzlich die 'Id' der als Swap zu nutzenden
 Partition auf 'SWP'.
 
-Wünschen Sie eine AHDI-kompatible Partitionierung? }
+Wünschen Sie eine AHDI-kompatible Partitionierung?
+}
 
 message set_kernel_1
 {Kernel (ATARITT)}

Index: src/distrib/utils/sysinst/arch/atari/msg.md.en
diff -u src/distrib/utils/sysinst/arch/atari/msg.md.en:1.10 src/distrib/utils/sysinst/arch/atari/msg.md.en:1.10.6.1
--- src/distrib/utils/sysinst/arch/atari/msg.md.en:1.10	Mon Apr  4 08:30:19 2011
+++ src/distrib/utils/sysinst/arch/atari/msg.md.en	Sun Dec 14 14:14:48 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.md.en,v 1.10 2011/04/04 08:30:19 mbalmer Exp $	*/
+/*	$NetBSD: msg.md.en,v 1.10.6.1 2014/12/14 14:14:48 martin Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -58,7 +58,8 @@ partitions to NetBSD before NetBSD is ab
 of all partitions you want to use for NetBSD file systems to 'NBD'. Change
 the 'id' of the partition you wish to use for swap to 'SWP'.
 
-Do you want AHDI compatible partitioning? }
+Do you want AHDI compatible partitioning?
+}
 
 message set_kernel_1
 {Kernel (ATARITT)}

Index: src/distrib/utils/sysinst/arch/atari/msg.md.es
diff -u src/distrib/utils/sysinst/arch/atari/msg.md.es:1.5 src/distrib/utils/sysinst/arch/atari/msg.md.es:1.5.6.1
--- src/distrib/utils/sysinst/arch/atari/msg.md.es:1.5	Mon Apr  4 08:30:19 2011
+++ src/distrib/utils/sysinst/arch/atari/msg.md.es	Sun Dec 14 14:14:48 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.md.es,v 1.5 2011/04/04 08:30:19 mbalmer Exp $	*/
+/*	$NetBSD: msg.md.es,v 1.5.6.1 2014/12/14 14:14:48 martin Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -58,7 +58,8 @@ particiones a NetBSD antes de que NetBSD
 de todas las particiones en las que quiera usar sistemas de archivos NetBSD
 a 'NBD'. Cambie la 'id' de la partición en la que quiera usar swap a 'SWP'.
 
-Quiere un particionaje compatible con AHDI? }
+Quiere un particionaje compatible con AHDI?
+}
 
 message set_kernel_1
 {Núcleo (ATARITT)}

CVS commit: [netbsd-6] src/distrib/utils/sysinst/arch

2014-07-17 Thread Jeff Rizzo 
Module Name:src
Committed By:   riz
Date:   Fri Jul 18 02:21:53 UTC 2014

Modified Files:
src/distrib/utils/sysinst/arch/alpha [netbsd-6]: md.c
src/distrib/utils/sysinst/arch/landisk [netbsd-6]: md.c
src/distrib/utils/sysinst/arch/macppc [netbsd-6]: md.c
src/distrib/utils/sysinst/arch/mipsco [netbsd-6]: md.c
src/distrib/utils/sysinst/arch/news68k [netbsd-6]: md.c
src/distrib/utils/sysinst/arch/newsmips [netbsd-6]: md.c
src/distrib/utils/sysinst/arch/pmax [netbsd-6]: md.c
src/distrib/utils/sysinst/arch/vax [netbsd-6]: md.c

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1079):
distrib/utils/sysinst/arch/newsmips/md.c: revision 1.22
distrib/utils/sysinst/arch/pmax/md.c: revision 1.68
distrib/utils/sysinst/arch/vax/md.c: revision 1.40
distrib/utils/sysinst/arch/alpha/md.c: revision 1.52
distrib/utils/sysinst/arch/macppc/md.c: revision 1.46
distrib/utils/sysinst/arch/mipsco/md.c: revision 1.21
distrib/utils/sysinst/arch/landisk/md.c: revision 1.11
distrib/utils/sysinst/arch/news68k/md.c: revision 1.35
Use msg_display(3) rather than printf(3) to print dobootblk messages.
The latter won't show any characters on the sysinst screen
and other ports have used the former.


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.51.2.1 src/distrib/utils/sysinst/arch/alpha/md.c
cvs rdiff -u -r1.10 -r1.10.2.1 src/distrib/utils/sysinst/arch/landisk/md.c
cvs rdiff -u -r1.45 -r1.45.2.1 src/distrib/utils/sysinst/arch/macppc/md.c
cvs rdiff -u -r1.20 -r1.20.2.1 src/distrib/utils/sysinst/arch/mipsco/md.c
cvs rdiff -u -r1.34 -r1.34.2.1 src/distrib/utils/sysinst/arch/news68k/md.c
cvs rdiff -u -r1.21 -r1.21.2.1 src/distrib/utils/sysinst/arch/newsmips/md.c
cvs rdiff -u -r1.67 -r1.67.2.1 src/distrib/utils/sysinst/arch/pmax/md.c
cvs rdiff -u -r1.39 -r1.39.2.1 src/distrib/utils/sysinst/arch/vax/md.c

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/arch/alpha/md.c
diff -u src/distrib/utils/sysinst/arch/alpha/md.c:1.51 src/distrib/utils/sysinst/arch/alpha/md.c:1.51.2.1
--- src/distrib/utils/sysinst/arch/alpha/md.c:1.51	Fri Nov  4 11:27:01 2011
+++ src/distrib/utils/sysinst/arch/alpha/md.c	Fri Jul 18 02:21:53 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.51 2011/11/04 11:27:01 martin Exp $ */
+/*	$NetBSD: md.c,v 1.51.2.1 2014/07/18 02:21:53 riz Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -151,7 +151,7 @@ md_post_newfs(void)
 	char *bootxx;
 	int error;
 
-	printf(msg_string(MSG_dobootblks), diskdev);
+	msg_display(MSG_dobootblks, diskdev);
 	cp_to_target(/usr/mdec/boot, /boot);
 	bootxx = bootxx_name();
 	if (bootxx != NULL) {

Index: src/distrib/utils/sysinst/arch/landisk/md.c
diff -u src/distrib/utils/sysinst/arch/landisk/md.c:1.10 src/distrib/utils/sysinst/arch/landisk/md.c:1.10.2.1
--- src/distrib/utils/sysinst/arch/landisk/md.c:1.10	Fri Nov  4 11:27:03 2011
+++ src/distrib/utils/sysinst/arch/landisk/md.c	Fri Jul 18 02:21:53 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.10 2011/11/04 11:27:03 martin Exp $	*/
+/*	$NetBSD: md.c,v 1.10.2.1 2014/07/18 02:21:53 riz Exp $	*/
 
 /*
  * Copyright 1997,2002 Piermont Information Systems Inc.
@@ -124,7 +124,7 @@ md_post_newfs(void)
 	char *bootxx;
 	int error;
 
-	printf (msg_string(MSG_dobootblks), diskdev);
+	msg_display(MSG_dobootblks, diskdev);
 	cp_to_target(/usr/mdec/boot, /boot);
 	bootxx = bootxx_name();
 	if (bootxx != NULL) {

Index: src/distrib/utils/sysinst/arch/macppc/md.c
diff -u src/distrib/utils/sysinst/arch/macppc/md.c:1.45 src/distrib/utils/sysinst/arch/macppc/md.c:1.45.2.1
--- src/distrib/utils/sysinst/arch/macppc/md.c:1.45	Fri Nov  4 11:27:03 2011
+++ src/distrib/utils/sysinst/arch/macppc/md.c	Fri Jul 18 02:21:53 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.45 2011/11/04 11:27:03 martin Exp $	*/
+/*	$NetBSD: md.c,v 1.45.2.1 2014/07/18 02:21:53 riz Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -175,7 +175,7 @@ md_post_newfs(void)
 	if (bsdlabel[PART_A].pi_offset != 0)
 		return 0;
 
-	printf (msg_string(MSG_dobootblks), diskdev);
+	msg_display(MSG_dobootblks, diskdev);
 	cp_to_target(/usr/mdec/ofwboot, bootfile);
 	sync();
 	run_program(RUN_DISPLAY, /usr/sbin/installboot /dev/r%sa %s %s,

Index: src/distrib/utils/sysinst/arch/mipsco/md.c
diff -u src/distrib/utils/sysinst/arch/mipsco/md.c:1.20 src/distrib/utils/sysinst/arch/mipsco/md.c:1.20.2.1
--- src/distrib/utils/sysinst/arch/mipsco/md.c:1.20	Thu Jan  5 21:32:36 2012
+++ src/distrib/utils/sysinst/arch/mipsco/md.c	Fri Jul 18 02:21:53 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.20 2012/01/05 21:32:36 christos Exp $	*/
+/*	$NetBSD: md.c,v 1.20.2.1 2014/07/18 02:21:53 riz Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -160,7 +160,7 @@ md_post_newfs(void)
 		return 0;
 	}
 
-

CVS commit: [netbsd-6] src/distrib/utils/sysinst/arch/alpha

2014-07-17 Thread Jeff Rizzo 
Module Name:src
Committed By:   riz
Date:   Fri Jul 18 02:41:34 UTC 2014

Modified Files:
src/distrib/utils/sysinst/arch/alpha [netbsd-6]: md.c

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1080):
distrib/utils/sysinst/arch/alpha/md.c: revision 1.53
Apply patch in PR port-alpha/48697 (with some tweaks).
Tru64 UNIX's disklabel is the same format as BSD disklabel,
and it seems Tru64 stores incorrect geometry values in
d_nsectors (sectors/track) and d_secpercyl (sectors/cylinder).
d_secperunit seems always reliable so use it to get
dlsec (sectors/track) and dlcylsize (sectors/cylinder) values.
Should be pulled up to netbsd-6 branches.


To generate a diff of this commit:
cvs rdiff -u -r1.51.2.1 -r1.51.2.2 src/distrib/utils/sysinst/arch/alpha/md.c

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/arch/alpha/md.c
diff -u src/distrib/utils/sysinst/arch/alpha/md.c:1.51.2.1 src/distrib/utils/sysinst/arch/alpha/md.c:1.51.2.2
--- src/distrib/utils/sysinst/arch/alpha/md.c:1.51.2.1	Fri Jul 18 02:21:53 2014
+++ src/distrib/utils/sysinst/arch/alpha/md.c	Fri Jul 18 02:41:34 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.51.2.1 2014/07/18 02:21:53 riz Exp $ */
+/*	$NetBSD: md.c,v 1.51.2.2 2014/07/18 02:41:34 riz Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -85,19 +85,19 @@ md_get_info(void)
 
 	dlcyl = disklabel.d_ncylinders;
 	dlhead = disklabel.d_ntracks;
-	dlsec = disklabel.d_nsectors;
 	sectorsize = disklabel.d_secsize;
-	dlcylsize = disklabel.d_secpercyl;
+	dlsize = disklabel.d_secperunit;
 
 	/*
-	 * Compute whole disk size. Take max of (dlcyl*dlhead*dlsec)
-	 * and secperunit,  just in case the disk is already labelled.
-	 * (If our new label's RAW_PART size ends up smaller than the
-	 * in-core RAW_PART size  value, updating the label will fail.)
+	 * Tru64 UNIX's disklabel is the same format as BSD disklabel,
+	 * and it seems Tru64 stores incorrect geometry values in
+	 * d_nsectors (sectors/track) and d_secpercyl (sectors/cylinder).
+	 * d_secperunit seems always reliable so use it to get
+	 * dlsec (sectors/track) and dlcylsize (sectors/cylinder) values.
+	 * See PR/48697 for details.
 	 */
-	dlsize = dlcyl*dlhead*dlsec;
-	if (disklabel.d_secperunit  dlsize)
-		dlsize = disklabel.d_secperunit;
+	dlsec = dlsize / (dlhead * dlcyl);
+	dlcylsize = dlsec * dlhead;
 
 	return 1;
 }

CVS commit: [netbsd-6] src/distrib/utils/sysinst

2013-10-20 Thread Manuel Bouyer 
Module Name:src
Committed By:   bouyer
Date:   Sun Oct 20 13:43:17 UTC 2013

Modified Files:
src/distrib/utils/sysinst [netbsd-6]: mbr.c

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #972):
distrib/utils/sysinst/mbr.c: revision 1.92
Fix another botch of my dumb patch in PR/45990; add missing braces.
The offset of MBR partition 0 was unintentionally set to 2048 even on
small (=128GB) disks.  Probably we should rethink the threshold,
but anyway sysinst(8) should follow fdisk(8) default.
http://nxr.NetBSD.org/xref/src/sbin/fdisk/fdisk.c?r=1.145#1199
http://cvsweb.NetBSD.org/bsdweb.cgi/src/sbin/fdisk/fdisk.c#rev1.129
The problem is pointed out and analyzed by Simon Nicolussi in PR/48304.
Should be pulled up to all netbsd-6* branches.


To generate a diff of this commit:
cvs rdiff -u -r1.89.2.2 -r1.89.2.3 src/distrib/utils/sysinst/mbr.c

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/mbr.c
diff -u src/distrib/utils/sysinst/mbr.c:1.89.2.2 src/distrib/utils/sysinst/mbr.c:1.89.2.3
--- src/distrib/utils/sysinst/mbr.c:1.89.2.2	Tue Jun 12 19:19:20 2012
+++ src/distrib/utils/sysinst/mbr.c	Sun Oct 20 13:43:17 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: mbr.c,v 1.89.2.2 2012/06/12 19:19:20 riz Exp $ */
+/*	$NetBSD: mbr.c,v 1.89.2.3 2013/10/20 13:43:17 bouyer Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -1890,8 +1890,9 @@ get_ptn_alignment(struct mbr_partition *
 		}
 	} else {
 		/* Use 1MB offset for large (128GB) disks */
-		if (dlsize  2048 * 1024 * 128)
+		if (dlsize  2048 * 1024 * 128) {
 			ptn_alignment = 2048;
 			ptn_0_offset = 2048;
+		}
 	}
 }

CVS commit: [netbsd-6] src/distrib/utils/sysinst

2012-11-24 Thread Julian Coleman 
Module Name:src
Committed By:   jdc
Date:   Sat Nov 24 19:32:28 UTC 2012

Modified Files:
src/distrib/utils/sysinst [netbsd-6]: disks.c

Log Message:
Pull up revision 1.127 (requested by tsutsui in ticket #706).

Don't show a disk which is mounted as root partition
in the Available disks list during sysinst procedure
to prevent users from shooting their foot in case of
installation using install-image on a USB stick.
Per suggestion in PR/47195.


To generate a diff of this commit:
cvs rdiff -u -r1.123.2.2 -r1.123.2.3 src/distrib/utils/sysinst/disks.c

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.2 src/distrib/utils/sysinst/disks.c:1.123.2.3
--- src/distrib/utils/sysinst/disks.c:1.123.2.2	Thu Jul  5 17:29:15 2012
+++ src/distrib/utils/sysinst/disks.c	Sat Nov 24 19:32:28 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: disks.c,v 1.123.2.2 2012/07/05 17:29:15 riz Exp $ */
+/*	$NetBSD: disks.c,v 1.123.2.3 2012/11/24 19:32:28 jdc Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -377,6 +377,14 @@ get_disks(struct disk_desc *dd)
 	break;
 continue;
 			}
+
+			/*
+			 * Exclude a disk mounted as root partition,
+			 * in case of install-image on a USB memstick.
+			 */
+			if (is_active_rootpart(dd-dd_name, 0))
+continue;
+
 			dd-dd_cyl = l.d_ncylinders;
 			dd-dd_head = l.d_ntracks;
 			dd-dd_sec = l.d_nsectors;

CVS commit: [netbsd-6] src/distrib/utils/sysinst/arch/i386

2012-11-18 Thread Jeff Rizzo 
Module Name:src
Committed By:   riz
Date:   Sun Nov 18 22:00:24 UTC 2012

Modified Files:
src/distrib/utils/sysinst/arch/i386 [netbsd-6]: msg.md.de msg.md.en
msg.md.es msg.md.fr msg.md.pl

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #648):
distrib/utils/sysinst/arch/i386/msg.md.pl: revision 1.37
distrib/utils/sysinst/arch/i386/msg.md.en: revision 1.64
distrib/utils/sysinst/arch/i386/msg.md.fr: revision 1.52
distrib/utils/sysinst/arch/i386/msg.md.es: revision 1.15
distrib/utils/sysinst/arch/i386/msg.md.de: revision 1.24
Remove useless md_may_remove_boot_medium messages.  PR/47039


To generate a diff of this commit:
cvs rdiff -u -r1.20.6.1 -r1.20.6.2 \
src/distrib/utils/sysinst/arch/i386/msg.md.de
cvs rdiff -u -r1.61.6.1 -r1.61.6.2 \
src/distrib/utils/sysinst/arch/i386/msg.md.en
cvs rdiff -u -r1.13.6.1 -r1.13.6.2 \
src/distrib/utils/sysinst/arch/i386/msg.md.es
cvs rdiff -u -r1.51 -r1.51.6.1 src/distrib/utils/sysinst/arch/i386/msg.md.fr
cvs rdiff -u -r1.34 -r1.34.6.1 src/distrib/utils/sysinst/arch/i386/msg.md.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/arch/i386/msg.md.de
diff -u src/distrib/utils/sysinst/arch/i386/msg.md.de:1.20.6.1 src/distrib/utils/sysinst/arch/i386/msg.md.de:1.20.6.2
--- src/distrib/utils/sysinst/arch/i386/msg.md.de:1.20.6.1	Thu May 17 18:57:14 2012
+++ src/distrib/utils/sysinst/arch/i386/msg.md.de	Sun Nov 18 22:00:24 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.md.de,v 1.20.6.1 2012/05/17 18:57:14 sborrill Exp $	*/
+/*	$NetBSD: msg.md.de,v 1.20.6.2 2012/11/18 22:00:24 riz Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -39,8 +39,7 @@ message md_hello
 }
 
 message md_may_remove_boot_medium
-{Wenn Sie von einer Diskette oder einem USB Laufwerk gebootet haben,
-können Sie diese(s) jetzt entfernen.
+{
 }
 
 message Keyboard_type {Tastaturschema}

Index: src/distrib/utils/sysinst/arch/i386/msg.md.en
diff -u src/distrib/utils/sysinst/arch/i386/msg.md.en:1.61.6.1 src/distrib/utils/sysinst/arch/i386/msg.md.en:1.61.6.2
--- src/distrib/utils/sysinst/arch/i386/msg.md.en:1.61.6.1	Thu May 17 18:57:14 2012
+++ src/distrib/utils/sysinst/arch/i386/msg.md.en	Sun Nov 18 22:00:23 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.md.en,v 1.61.6.1 2012/05/17 18:57:14 sborrill Exp $	*/
+/*	$NetBSD: msg.md.en,v 1.61.6.2 2012/11/18 22:00:23 riz Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -39,8 +39,7 @@ message md_hello
 }
 
 message md_may_remove_boot_medium
-{If you booted from removable media such as a USB drive or floppy disk, you
-may now remove the device.
+{
 }
 
 message Keyboard_type {Keyboard type}

Index: src/distrib/utils/sysinst/arch/i386/msg.md.es
diff -u src/distrib/utils/sysinst/arch/i386/msg.md.es:1.13.6.1 src/distrib/utils/sysinst/arch/i386/msg.md.es:1.13.6.2
--- src/distrib/utils/sysinst/arch/i386/msg.md.es:1.13.6.1	Thu May 17 18:57:14 2012
+++ src/distrib/utils/sysinst/arch/i386/msg.md.es	Sun Nov 18 22:00:24 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.md.es,v 1.13.6.1 2012/05/17 18:57:14 sborrill Exp $	*/
+/*	$NetBSD: msg.md.es,v 1.13.6.2 2012/11/18 22:00:24 riz Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -39,7 +39,7 @@ message md_hello
 }
 
 message md_may_remove_boot_medium
-{Si ha iniciado desde disquette, ahora deberia retirar el disco.
+{
 }
 
 message Keyboard_type {Tipo de teclado}

Index: src/distrib/utils/sysinst/arch/i386/msg.md.fr
diff -u src/distrib/utils/sysinst/arch/i386/msg.md.fr:1.51 src/distrib/utils/sysinst/arch/i386/msg.md.fr:1.51.6.1
--- src/distrib/utils/sysinst/arch/i386/msg.md.fr:1.51	Mon Apr  4 08:30:32 2011
+++ src/distrib/utils/sysinst/arch/i386/msg.md.fr	Sun Nov 18 22:00:24 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.md.fr,v 1.51 2011/04/04 08:30:32 mbalmer Exp $	*/
+/*	$NetBSD: msg.md.fr,v 1.51.6.1 2012/11/18 22:00:24 riz Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -39,8 +39,7 @@ message md_hello
 }
 
 message md_may_remove_boot_medium
-{Si vous avez démarré sur un média amovible (clé USB, disquette...), vous
-pouvez maintenant le retirer.
+{
 }
 
 message Keyboard_type {Type de clavier}

Index: src/distrib/utils/sysinst/arch/i386/msg.md.pl
diff -u src/distrib/utils/sysinst/arch/i386/msg.md.pl:1.34 src/distrib/utils/sysinst/arch/i386/msg.md.pl:1.34.6.1
--- src/distrib/utils/sysinst/arch/i386/msg.md.pl:1.34	Mon Apr  4 08:30:33 2011
+++ src/distrib/utils/sysinst/arch/i386/msg.md.pl	Sun Nov 18 22:00:23 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.md.pl,v 1.34 2011/04/04 08:30:33 mbalmer Exp $	*/
+/*	$NetBSD: msg.md.pl,v 1.34.6.1 2012/11/18 22:00:23 riz Exp $	*/
 /*	Based on english version: */
 /*	NetBSD: msg.md.en,v 1.24 2001/01/27 07:34:39 jmc Exp 	*/
 
@@ -41,7 +41,7 @@ message md_hello
 }
 
 message md_may_remove_boot_medium
-{Jesli uruchomiles komputer z

CVS commit: [netbsd-6] src/distrib/utils/sysinst

2012-11-18 Thread Jeff Rizzo 
Module Name:src
Committed By:   riz
Date:   Sun Nov 18 22:04:44 UTC 2012

Modified Files:
src/distrib/utils/sysinst [netbsd-6]: msg.mi.de msg.mi.en msg.mi.es
msg.mi.fr msg.mi.pl util.c
src/distrib/utils/sysinst/arch/amd64 [netbsd-6]: Makefile
src/distrib/utils/sysinst/arch/i386 [netbsd-6]: Makefile

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #649):
distrib/utils/sysinst/msg.mi.es: revision 1.48
distrib/utils/sysinst/arch/i386/Makefile: revision 1.18
distrib/utils/sysinst/msg.mi.en: revision 1.176
distrib/utils/sysinst/arch/amd64/Makefile: revision 1.8
distrib/utils/sysinst/msg.mi.de: revision 1.71
distrib/utils/sysinst/msg.mi.fr: revision 1.130
distrib/utils/sysinst/util.c: revision 1.180
distrib/utils/sysinst/msg.mi.pl: revision 1.87
Make the default choice of Install from menu to use the sets
in the default file system (assuming which come with the CD/USB image)
and skip distmedium menu if the root file system is not md(4).
Also change CD-ROM / DVD menu option accordingly on ports which
have install images.  PR/47038
XXX: still no responsible maintainer of non-en translations


To generate a diff of this commit:
cvs rdiff -u -r1.61.2.3 -r1.61.2.4 src/distrib/utils/sysinst/msg.mi.de
cvs rdiff -u -r1.169.2.3 -r1.169.2.4 src/distrib/utils/sysinst/msg.mi.en
cvs rdiff -u -r1.39.2.4 -r1.39.2.5 src/distrib/utils/sysinst/msg.mi.es
cvs rdiff -u -r1.119.2.3 -r1.119.2.4 src/distrib/utils/sysinst/msg.mi.fr
cvs rdiff -u -r1.78.2.3 -r1.78.2.4 src/distrib/utils/sysinst/msg.mi.pl
cvs rdiff -u -r1.173.2.1 -r1.173.2.2 src/distrib/utils/sysinst/util.c
cvs rdiff -u -r1.7 -r1.7.54.1 src/distrib/utils/sysinst/arch/amd64/Makefile
cvs rdiff -u -r1.17 -r1.17.54.1 src/distrib/utils/sysinst/arch/i386/Makefile

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/msg.mi.de
diff -u src/distrib/utils/sysinst/msg.mi.de:1.61.2.3 src/distrib/utils/sysinst/msg.mi.de:1.61.2.4
--- src/distrib/utils/sysinst/msg.mi.de:1.61.2.3	Sun Sep 30 18:53:58 2012
+++ src/distrib/utils/sysinst/msg.mi.de	Sun Nov 18 22:04:43 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.mi.de,v 1.61.2.3 2012/09/30 18:53:58 bouyer Exp $	*/
+/*	$NetBSD: msg.mi.de,v 1.61.2.4 2012/11/18 22:04:43 riz Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -976,7 +976,11 @@ message Select_medium {Medium auswählen}
 message ftp {FTP}
 message http {HTTP}
 message nfs {NFS}
+.if HAVE_INSTALL_IMAGE
+message cdrom {CD-ROM / DVD / install image media}	/* XXX translation */
+.else
 message cdrom {CD-ROM / DVD}
+.endif
 message floppy {Diskette}
 message local_fs {Ungemountetes Dateisysytem}
 message local_dir {Lokales Verzeichnis}

Index: src/distrib/utils/sysinst/msg.mi.en
diff -u src/distrib/utils/sysinst/msg.mi.en:1.169.2.3 src/distrib/utils/sysinst/msg.mi.en:1.169.2.4
--- src/distrib/utils/sysinst/msg.mi.en:1.169.2.3	Sun Sep 30 18:53:58 2012
+++ src/distrib/utils/sysinst/msg.mi.en	Sun Nov 18 22:04:43 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.mi.en,v 1.169.2.3 2012/09/30 18:53:58 bouyer Exp $	*/
+/*	$NetBSD: msg.mi.en,v 1.169.2.4 2012/11/18 22:04:43 riz Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -916,7 +916,11 @@ message Select_medium {Install from}
 message ftp {FTP}
 message http {HTTP}
 message nfs {NFS}
+.if HAVE_INSTALL_IMAGE
+message cdrom {CD-ROM / DVD / install image media}
+.else
 message cdrom {CD-ROM / DVD}
+.endif
 message floppy {Floppy}
 message local_fs {Unmounted fs}
 message local_dir {Local directory}

Index: src/distrib/utils/sysinst/msg.mi.es
diff -u src/distrib/utils/sysinst/msg.mi.es:1.39.2.4 src/distrib/utils/sysinst/msg.mi.es:1.39.2.5
--- src/distrib/utils/sysinst/msg.mi.es:1.39.2.4	Sun Sep 30 18:53:57 2012
+++ src/distrib/utils/sysinst/msg.mi.es	Sun Nov 18 22:04:42 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.mi.es,v 1.39.2.4 2012/09/30 18:53:57 bouyer Exp $	*/
+/*	$NetBSD: msg.mi.es,v 1.39.2.5 2012/11/18 22:04:42 riz Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -942,7 +942,11 @@ message Select_medium {Seleccione el med
 message ftp {FTP}
 message http {HTTP}
 message nfs {NFS}
+.if HAVE_INSTALL_IMAGE
+message cdrom {CD-ROM / DVD / install image media}	/* XXX translation */
+.else
 message cdrom {CD-ROM / DVD}
+.endif
 message floppy {Disquete}
 message local_fs {Sistema de archivos desmontado}
 message local_dir {Directorio Local}

Index: src/distrib/utils/sysinst/msg.mi.fr
diff -u src/distrib/utils/sysinst/msg.mi.fr:1.119.2.3 src/distrib/utils/sysinst/msg.mi.fr:1.119.2.4
--- src/distrib/utils/sysinst/msg.mi.fr:1.119.2.3	Sun Sep 30 18:53:57 2012
+++ src/distrib/utils/sysinst/msg.mi.fr	Sun Nov 18 22:04:43 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.mi.fr,v 1.119.2.3 2012/09/30 18:53:57 bouyer Exp $	*/
+/*	$NetBSD: msg.mi.fr,v 1.119.2.4 2012/11/18 22:04:43 riz Exp $

CVS commit: [netbsd-6] src/distrib/utils/sysinst

2012-10-01 Thread Jeff Rizzo 
Module Name:src
Committed By:   riz
Date:   Mon Oct  1 17:43:01 UTC 2012

Modified Files:
src/distrib/utils/sysinst [netbsd-6]: net.c

Log Message:
Pull up following revision(s) (requested by jdf in ticket #570):
distrib/utils/sysinst/net.c: revision 1.133
Prevent sysinst from setting an fqdn in rc.conf when the user entered no
domain (i.e., sets only the hostname).  Fix for PR install/46946.


To generate a diff of this commit:
cvs rdiff -u -r1.130.2.1 -r1.130.2.2 src/distrib/utils/sysinst/net.c

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/net.c
diff -u src/distrib/utils/sysinst/net.c:1.130.2.1 src/distrib/utils/sysinst/net.c:1.130.2.2
--- src/distrib/utils/sysinst/net.c:1.130.2.1	Thu May 17 18:57:11 2012
+++ src/distrib/utils/sysinst/net.c	Mon Oct  1 17:43:00 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: net.c,v 1.130.2.1 2012/05/17 18:57:11 sborrill Exp $	*/
+/*	$NetBSD: net.c,v 1.130.2.2 2012/10/01 17:43:00 riz Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -435,9 +435,9 @@ recombine_host_domain(void)
 
 	strlcpy(recombined, net_host, sizeof(recombined));
 
-	if (l = 0 ||
+	if (strlen(net_domain) != 0  (l = 0 ||
 	net_host[l - 1] != '.' ||
-	strcasecmp(net_domain, net_host + l) != 0) {
+	strcasecmp(net_domain, net_host + l) != 0)) {
 		/* net_host isn't an FQDN. */
 		strlcat(recombined, ., sizeof(recombined));
 		strlcat(recombined, net_domain, sizeof(recombined));

CVS commit: [netbsd-6] src/distrib/utils/sysinst

2012-09-30 Thread Manuel Bouyer 
Module Name:src
Committed By:   bouyer
Date:   Sun Sep 30 18:53:59 UTC 2012

Modified Files:
src/distrib/utils/sysinst [netbsd-6]: 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 #567):
distrib/utils/sysinst/msg.mi.es: revision 1.46
distrib/utils/sysinst/msg.mi.es: revision 1.47
distrib/utils/sysinst/msg.mi.fr: revision 1.129
distrib/utils/sysinst/msg.mi.en: revision 1.175
distrib/utils/sysinst/msg.mi.de: revision 1.70
distrib/utils/sysinst/menus.mi: revision 1.47
distrib/utils/sysinst/msg.mi.pl: revision 1.86
Add translations for Config menu (was hardcoded before), best guesses for
French and Spanish.
Add translations for Polish config menu entries (provided by Marcin Piotr
Pawlowski).
Add Spanish translations for sysinst's new configuration menu, plus adding a
few
that were left previously.
Translation provided by jmmv.


To generate a diff of this commit:
cvs rdiff -u -r1.61.2.2 -r1.61.2.3 src/distrib/utils/sysinst/msg.mi.de
cvs rdiff -u -r1.169.2.2 -r1.169.2.3 src/distrib/utils/sysinst/msg.mi.en
cvs rdiff -u -r1.39.2.3 -r1.39.2.4 src/distrib/utils/sysinst/msg.mi.es
cvs rdiff -u -r1.119.2.2 -r1.119.2.3 src/distrib/utils/sysinst/msg.mi.fr
cvs rdiff -u -r1.78.2.2 -r1.78.2.3 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/msg.mi.de
diff -u src/distrib/utils/sysinst/msg.mi.de:1.61.2.2 src/distrib/utils/sysinst/msg.mi.de:1.61.2.3
--- src/distrib/utils/sysinst/msg.mi.de:1.61.2.2	Thu Jul  5 17:29:15 2012
+++ src/distrib/utils/sysinst/msg.mi.de	Sun Sep 30 18:53:58 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.mi.de,v 1.61.2.2 2012/07/05 17:29:15 riz Exp $	*/
+/*	$NetBSD: msg.mi.de,v 1.61.2.3 2012/09/30 18:53:58 bouyer Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -955,6 +955,7 @@ message Upgrade_NetBSD_on_a_hard_disk {A
 message Re_install_sets_or_install_additional_sets {Erneute Installation oder zusätzliche Pakete installieren}
 message Reboot_the_computer {Computer neu starten}
 message Utility_menu {Extras}
+message Config_menu {Konfigurationsmenü}
 message exit_utility_menu {Zurück zum Hauptmenü}
 message NetBSD_VERSION_Utilities {NetBSD-@@VERSION@@ Extras}
 message Run_bin_sh {Ausführen von /bin/sh}

Index: src/distrib/utils/sysinst/msg.mi.en
diff -u src/distrib/utils/sysinst/msg.mi.en:1.169.2.2 src/distrib/utils/sysinst/msg.mi.en:1.169.2.3
--- src/distrib/utils/sysinst/msg.mi.en:1.169.2.2	Thu Jul  5 17:29:15 2012
+++ src/distrib/utils/sysinst/msg.mi.en	Sun Sep 30 18:53:58 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.mi.en,v 1.169.2.2 2012/07/05 17:29:15 riz Exp $	*/
+/*	$NetBSD: msg.mi.en,v 1.169.2.3 2012/09/30 18:53:58 bouyer Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -895,6 +895,7 @@ message Upgrade_NetBSD_on_a_hard_disk {U
 message Re_install_sets_or_install_additional_sets {Re-install sets or install additional sets}
 message Reboot_the_computer {Reboot the computer}
 message Utility_menu {Utility menu}
+message Config_menu {Config menu}
 message exit_utility_menu {Back to main menu}
 message NetBSD_VERSION_Utilities {NetBSD-@@VERSION@@ Utilities}
 message Run_bin_sh {Run /bin/sh}

Index: src/distrib/utils/sysinst/msg.mi.es
diff -u src/distrib/utils/sysinst/msg.mi.es:1.39.2.3 src/distrib/utils/sysinst/msg.mi.es:1.39.2.4
--- src/distrib/utils/sysinst/msg.mi.es:1.39.2.3	Sun Sep 30 18:46:39 2012
+++ src/distrib/utils/sysinst/msg.mi.es	Sun Sep 30 18:53:57 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.mi.es,v 1.39.2.3 2012/09/30 18:46:39 bouyer Exp $	*/
+/*	$NetBSD: msg.mi.es,v 1.39.2.4 2012/09/30 18:53:57 bouyer Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.

Index: src/distrib/utils/sysinst/msg.mi.fr
diff -u src/distrib/utils/sysinst/msg.mi.fr:1.119.2.2 src/distrib/utils/sysinst/msg.mi.fr:1.119.2.3
--- src/distrib/utils/sysinst/msg.mi.fr:1.119.2.2	Thu Jul  5 17:29:15 2012
+++ src/distrib/utils/sysinst/msg.mi.fr	Sun Sep 30 18:53:57 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.mi.fr,v 1.119.2.2 2012/07/05 17:29:15 riz Exp $	*/
+/*	$NetBSD: msg.mi.fr,v 1.119.2.3 2012/09/30 18:53:57 bouyer Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -993,6 +993,7 @@ message Upgrade_NetBSD_on_a_hard_disk {M
 message Re_install_sets_or_install_additional_sets {Réinstaller ou installer de nouveaux composants}
 message Reboot_the_computer {Redémarrer l'ordinateur}
 message Utility_menu {Utilitaires}
+message Config_menu {Configuration}
 message exit_utility_menu {Quitter}
 message NetBSD_VERSION_Utilities {Utilitaires NetBSD-@@VERSION@@}
 message Run_bin_sh {Exécuter /bin/sh}

Index: src/distrib/utils/sysinst/msg.mi.pl
diff -u src/distrib/utils/sysinst/msg.mi.pl:1.78.2.2 src/distrib/utils/sysinst/msg.mi.pl:1.78.2.3
---

CVS commit: [netbsd-6] src/distrib/utils/sysinst

2012-07-05 Thread Jeff Rizzo 
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

CVS commit: [netbsd-6] src/distrib/utils/sysinst

2012-07-04 Thread Julian Coleman 
Module Name:src
Committed By:   jdc
Date:   Wed Jul  4 20:48:56 UTC 2012

Modified Files:
src/distrib/utils/sysinst [netbsd-6]: defs.h disks.c main.c
src/distrib/utils/sysinst/arch/emips [netbsd-6]: md.h
src/distrib/utils/sysinst/arch/i386 [netbsd-6]: md.h
src/distrib/utils/sysinst/arch/vax [netbsd-6]: md.h

Log Message:
Pull up revisions:
  src/distrib/utils/sysinst/defs.h revision 1.163
  src/distrib/utils/sysinst/disks.c revisions 1.125,1.126
  src/distrib/utils/sysinst/main.c revisions 1.65,1.66
  src/distrib/utils/sysinst/arch/emips/md.h revision 1.4
  src/distrib/utils/sysinst/arch/i386/md.h revision 1.69
  src/distrib/utils/sysinst/arch/vax/md.h revision 1.21
(requested by abs in ticket #386).

- Replace the CD_NAME definition with a CD_NAMES comma separate list,
 the default remains cd0a, but i386 sets cd0a, mcd0a while vax
 takes cd0a, racd0a
- Add get_default_cdrom() to disks.c, which is called in init(). This
 checks the contents of hw.disknames against CD_NAMES. The first one
 found (minus partition letter) is picked, otherwise the first entry
 in CD_NAMES is used
The primary beneficiary is vax systems with an MSCP but no SCSI CD
drive, which now default to (a valid) racd0a rather than an invalid
cd0a.  The obvious example being simh-vax

Trying to print a function pointer as a string is likely to cause tears.
While here, don't match on the unit either

Do not assign to a const pointer, but set the value of the target variable
instead. Makes sysinst at least start up again.


To generate a diff of this commit:
cvs rdiff -u -r1.161.2.1 -r1.161.2.2 src/distrib/utils/sysinst/defs.h
cvs rdiff -u -r1.123 -r1.123.2.1 src/distrib/utils/sysinst/disks.c
cvs rdiff -u -r1.63.2.1 -r1.63.2.2 src/distrib/utils/sysinst/main.c
cvs rdiff -u -r1.3 -r1.3.6.1 src/distrib/utils/sysinst/arch/emips/md.h
cvs rdiff -u -r1.68 -r1.68.6.1 src/distrib/utils/sysinst/arch/i386/md.h
cvs rdiff -u -r1.20 -r1.20.6.1 src/distrib/utils/sysinst/arch/vax/md.h

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/defs.h
diff -u src/distrib/utils/sysinst/defs.h:1.161.2.1 src/distrib/utils/sysinst/defs.h:1.161.2.2
--- src/distrib/utils/sysinst/defs.h:1.161.2.1	Thu May 17 18:57:08 2012
+++ src/distrib/utils/sysinst/defs.h	Wed Jul  4 20:48:55 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: defs.h,v 1.161.2.1 2012/05/17 18:57:08 sborrill Exp $	*/
+/*	$NetBSD: defs.h,v 1.161.2.2 2012/07/04 20:48:55 jdc Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -171,10 +171,8 @@ enum {
 #define PI_ISBSDFS(p) ((p)-pi_fstype == FS_BSDLFS || \
 		   (p)-pi_fstype == FS_BSDFFS)
 
-/* non-standard cd0 driver */
-#ifndef CD_NAME
-#define CD_NAME cd0a
-#endif
+/* standard cd0 device */
+#define CD_NAMES cd0a
 
 /* Types */
 typedef struct distinfo {
@@ -379,6 +377,7 @@ int	md_update(void);
 void	toplevel(void);
 
 /* from disks.c */
+const char *get_default_cdrom(void);
 int	find_disks(const char *);
 struct menudesc;
 void	fmt_fspart(struct menudesc *, int, void *);

Index: src/distrib/utils/sysinst/disks.c
diff -u src/distrib/utils/sysinst/disks.c:1.123 src/distrib/utils/sysinst/disks.c:1.123.2.1
--- src/distrib/utils/sysinst/disks.c:1.123	Mon Jan  9 01:51:47 2012
+++ src/distrib/utils/sysinst/disks.c	Wed Jul  4 20:48:55 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: disks.c,v 1.123 2012/01/09 01:51:47 riz Exp $ */
+/*	$NetBSD: disks.c,v 1.123.2.1 2012/07/04 20:48:55 jdc Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -43,6 +43,7 @@
 #include util.h
 
 #include sys/param.h
+#include sys/sysctl.h
 #include sys/swap.h
 #include ufs/ufs/dinode.h
 #include ufs/ffs/fs.h
@@ -305,6 +306,48 @@ done:
 		strcpy(dd-dd_descr, dd-dd_name);
 }
 
+/* disknames - contains device names without partition letters
+ * cdrom_devices - contains devices including partition letters
+ * returns the first entry in hw.disknames matching a cdrom_device, or
+ * first entry on error or no match
+ */
+const char *
+get_default_cdrom(void)
+{
+	static const char *cdrom_devices[] = { CD_NAMES, 0};
+	static const char mib_name[] = hw.disknames;
+	size_t len;
+	char *disknames;
+	char *last;
+	char *name;
+	const char **arg;
+	const char *cd_dev;
+
+	/* On error just use first entry in cdrom_devices */
+	if (sysctlbyname(mib_name, NULL, len, NULL, 0) == -1)
+		return cdrom_devices[0];
+	if ((disknames = malloc(len + 2)) == 0) /* skip on malloc fail */
+		return cdrom_devices[0];
+
+	(void)sysctlbyname(mib_name, disknames, len, NULL, 0);
+for ((name = strtok_r(disknames,  , last)); name;
+	(name = strtok_r(NULL,  , last))) {
+		for (arg = cdrom_devices; *arg; ++arg) {
+			cd_dev = *arg;
+			/* skip unit and partition */
+			if (strncmp(cd_dev, name, strlen(cd_dev) - 2) != 0)
+continue;
+			if (name != disknames)
+strcpy(disknames, name);
+			strcat(disknames, a);
+			/* XXX: leaks, but so what? */

CVS commit: [netbsd-6] src/distrib/utils/sysinst

2012-06-12 Thread Jeff Rizzo 
Module Name:src
Committed By:   riz
Date:   Tue Jun 12 19:19:21 UTC 2012

Modified Files:
src/distrib/utils/sysinst [netbsd-6]: mbr.c

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #317):
distrib/utils/sysinst/mbr.c: revision 1.91
Fix regression by my dumb patch in PR/45990.
sysinst fails with floating exception after
changing MBR partition size in MBR editor menu
if the target disk doesn't have valid MBR partition
or has a valid partition 0 whose offset is not 1MB aligned
(like 63 sectors).
read_mbr() (which calls get_ptn_alignment()) is called
before set_bios_geom(), so bhead is not initialized there
and ptn_alignment could be zero.
To workaround, explicitly call get_ptn_alignment() again
in edit_mbr() to update ptn_alignemnt per BIOS geom values.


To generate a diff of this commit:
cvs rdiff -u -r1.89.2.1 -r1.89.2.2 src/distrib/utils/sysinst/mbr.c

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/mbr.c
diff -u src/distrib/utils/sysinst/mbr.c:1.89.2.1 src/distrib/utils/sysinst/mbr.c:1.89.2.2
--- src/distrib/utils/sysinst/mbr.c:1.89.2.1	Thu May 17 18:57:08 2012
+++ src/distrib/utils/sysinst/mbr.c	Tue Jun 12 19:19:20 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: mbr.c,v 1.89.2.1 2012/05/17 18:57:08 sborrill Exp $ */
+/*	$NetBSD: mbr.c,v 1.89.2.2 2012/06/12 19:19:20 riz Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -1271,6 +1271,7 @@ edit_mbr(mbr_info_t *mbri)
 	/* Ask full/part */
 
 	part = mbrs-mbr_parts[0];
+	get_ptn_alignment(part);	/* update ptn_alignment */
 	msg_display(MSG_fullpart, diskdev);
 	process_menu(MENU_fullpart, usefull);
 
@@ -1477,7 +1478,7 @@ read_mbr(const char *disk, mbr_info_t *m
 
 		mbrp = mbrs-mbr_parts[0];
 		if (ext_base == 0) {
-			get_ptn_alignment(mbrp);
+			get_ptn_alignment(mbrp);	/* get ptn_0_offset */
 		} else {
 			/* sanity check extended chain */
 			if (MBR_IS_EXTENDED(mbrp[0].mbrp_type))

CVS commit: [netbsd-6] src/distrib/utils/sysinst

2012-05-17 Thread Stephen Borrill 
Module Name:src
Committed By:   sborrill
Date:   Fri May 18 02:28:52 UTC 2012

Added Files:
src/distrib/utils/sysinst [netbsd-6]: checkrc.c configmenu.c

Log Message:
Add new files from ticket #247:

Pull up the following revisions(s) (requested by riz in ticket #247):
distrib/utils/sysinst/Makefile.inc: revision 1.59 via patch
distrib/utils/sysinst/checkrc.c: revision 1.1-1.2 via patch
distrib/utils/sysinst/configmenu.c: revision 1.1-1.5 via patch
distrib/utils/sysinst/defs.h: revision 1.162 via patch
distrib/utils/sysinst/install.c: revision 1.46 via patch
distrib/utils/sysinst/main.c: revision 1.64 via patch
distrib/utils/sysinst/mbr.c: revision 1.90 via patch
distrib/utils/sysinst/menus.mi: revision 1.45-1.46 via patch
distrib/utils/sysinst/msg.mbr.de: revision 1.12 via patch
distrib/utils/sysinst/msg.mbr.en: revision 1.16-1.17 via patch
distrib/utils/sysinst/msg.mbr.es: revision 1.7 via patch
distrib/utils/sysinst/msg.mbr.fr: revision 1.18-1.19 via patch
distrib/utils/sysinst/msg.mbr.pl: revision 1.15-1.16 via patch
distrib/utils/sysinst/msg.mi.de: revision 1.62-1.67 via patch
distrib/utils/sysinst/msg.mi.en: revision 1.170-1.172 via patch
distrib/utils/sysinst/msg.mi.es: revision 1.40-1.43 via patch
distrib/utils/sysinst/msg.mi.fr: revision 1.120-1.126 via patch
distrib/utils/sysinst/msg.mi.pl: revision 1.79-1.83 via patch
distrib/utils/sysinst/net.c: revision 1.131-1.132 via patch
distrib/utils/sysinst/run.c: revision 1.70 via patch
distrib/utils/sysinst/target.c: revision 1.55 via patch
distrib/utils/sysinst/util.c: revision 1.174-1.178 via patch
distrib/utils/sysinst/arch/evbarm/msg.md.de: revision 1.10-1.11 via 
patch
distrib/utils/sysinst/arch/evbmips/md.c: revision 1.10 via patch
distrib/utils/sysinst/arch/hp300/msg.md.de: revision 1.6-1.7 via patch
distrib/utils/sysinst/arch/hp300/msg.md.en: revision 1.9 via patch
distrib/utils/sysinst/arch/hp300/msg.md.es: revision 1.5 via patch
distrib/utils/sysinst/arch/hp300/msg.md.fr: revision 1.8 via patch
distrib/utils/sysinst/arch/hp300/msg.md.pl: revision 1.8 via patch
distrib/utils/sysinst/arch/i386/msg.md.en: revision 1.62-1.63 via patch
distrib/utils/sysinst/arch/i386/msg.md.es: revision 1.14 via patch
distrib/utils/sysinst/arch/i386/msg.md.de: revision 1.23

Sync sysinst with -current as of 2011-05-17
Add new post-install configuration menu for sysinst, and apply numerous
bug fixes.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.2.2.2 src/distrib/utils/sysinst/checkrc.c
cvs rdiff -u -r0 -r1.5.2.2 src/distrib/utils/sysinst/configmenu.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/distrib/utils/sysinst/checkrc.c
diff -u /dev/null src/distrib/utils/sysinst/checkrc.c:1.2.2.2
--- /dev/null	Fri May 18 02:28:52 2012
+++ src/distrib/utils/sysinst/checkrc.c	Fri May 18 02:28:52 2012
@@ -0,0 +1,117 @@
+/* $NetBSD: checkrc.c,v 1.2.2.2 2012/05/18 02:28:52 sborrill Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jeffrey C. Rizzo
+ *
+ * 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
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* checkrc.c -- Create a script on the target to check the state of
+ * its rc.conf variables. */
+
+#include curses.h
+#include err.h
+#include stdio.h
+#include defs.h
+#include msg_defs.h
+#include menu_defs.h
+
+#define