CVS commit: [netbsd-6] src/distrib/utils/sysinst/arch
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/i386
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 dyskietki
CVS commit: [netbsd-6] src/distrib/utils/sysinst/arch/atari
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/alpha
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; }
