Module Name: src
Committed By: snj
Date: Wed May 13 17:04:27 UTC 2015
Modified Files:
src/usr.sbin/sysinst [netbsd-7]: menus.mi msg.mi.de msg.mi.en msg.mi.es
msg.mi.fr msg.mi.pl
Log Message:
Pull up following revision(s) (requested by martin in ticket #754):
usr.sbin/sysinst/menus.mi: revision 1.6
usr.sbin/sysinst/msg.mi.de: revision 1.5
usr.sbin/sysinst/msg.mi.en: revision 1.5
usr.sbin/sysinst/msg.mi.es: revision 1.5
usr.sbin/sysinst/msg.mi.fr: revision 1.5
usr.sbin/sysinst/msg.mi.pl: revision 1.5
Change the IPv6 DNS selection to use DNS selection and add the
Google Public V4 DNS servers to the list.
The other field can take an IPv4 or IPv6 name server of choice.
Fixes PR install/49231.
To generate a diff of this commit:
cvs rdiff -u -r1.4.4.2 -r1.4.4.3 src/usr.sbin/sysinst/menus.mi
cvs rdiff -u -r1.2.4.1 -r1.2.4.2 src/usr.sbin/sysinst/msg.mi.de \
src/usr.sbin/sysinst/msg.mi.es src/usr.sbin/sysinst/msg.mi.fr
cvs rdiff -u -r1.2.4.4 -r1.2.4.5 src/usr.sbin/sysinst/msg.mi.en
cvs rdiff -u -r1.2.4.3 -r1.2.4.4 src/usr.sbin/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/usr.sbin/sysinst/menus.mi
diff -u src/usr.sbin/sysinst/menus.mi:1.4.4.2 src/usr.sbin/sysinst/menus.mi:1.4.4.3
--- src/usr.sbin/sysinst/menus.mi:1.4.4.2 Sat May 9 13:52:37 2015
+++ src/usr.sbin/sysinst/menus.mi Wed May 13 17:04:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: menus.mi,v 1.4.4.2 2015/05/09 13:52:37 msaitoh Exp $ */
+/* $NetBSD: menus.mi,v 1.4.4.3 2015/05/13 17:04:27 snj Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -477,8 +477,28 @@ menu localdirsource, y=-4, x=0, w=70, no
action { src_prompt(MSG_Set_dir_src, set_dir_src, 60); };
option MSG_exit_menu_generic, exit, action { yesno = SET_RETRY; };
-menu namesrv6, title MSG_Select_IPv6_DNS_server;
- option "google-public-dns-a.google.com", exit, action
+menu namesrv6, title MSG_Select_DNS_server;
+ option "google-public-dns-a.google.com (IPv4)", exit, action
+ {
+#ifdef INET6
+ strlcpy(net_namesvr, "8.8.8.8",
+ sizeof(net_namesvr));
+ yesno = 1;
+#else
+ yesno = 0;
+#endif
+ };
+ option "google-public-dns-b.google.com (IPv4)", exit, action
+ {
+#ifdef INET6
+ strlcpy(net_namesvr, "8.8.4.4",
+ sizeof(net_namesvr));
+ yesno = 1;
+#else
+ yesno = 0;
+#endif
+ };
+ option "google-public-dns-a.google.com (IPv6)", exit, action
{
#ifdef INET6
strlcpy(net_namesvr6, "2001:4860:4860::8888",
@@ -488,7 +508,7 @@ menu namesrv6, title MSG_Select_IPv6_DNS
yesno = 0;
#endif
};
- option "google-public-dns-b.google.com", exit, action
+ option "google-public-dns-b.google.com (IPv6)", exit, action
{
#ifdef INET6
strlcpy(net_namesvr6, "2001:4860:4860::8844",
Index: src/usr.sbin/sysinst/msg.mi.de
diff -u src/usr.sbin/sysinst/msg.mi.de:1.2.4.1 src/usr.sbin/sysinst/msg.mi.de:1.2.4.2
--- src/usr.sbin/sysinst/msg.mi.de:1.2.4.1 Tue Jan 20 09:42:31 2015
+++ src/usr.sbin/sysinst/msg.mi.de Wed May 13 17:04:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.de,v 1.2.4.1 2015/01/20 09:42:31 martin Exp $ */
+/* $NetBSD: msg.mi.de,v 1.2.4.2 2015/05/13 17:04:27 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1006,7 +1006,7 @@ message Abandon {Installation abbrechen}
message Abort_fetch {Holen abbrechen}
message Device {Ger�t}
message File_system {Dateisystem}
-message Select_IPv6_DNS_server { Ausw�hlen eines IPv6 DNS Servers}
+message Select_DNS_server { Ausw�hlen eines DNS Servers}
message other {andere }
message Perform_IPv6_autoconfiguration {IPv6 automatisch konfigurieren?}
message Perform_DHCP_autoconfiguration {Konfiguration per DHCP ermitteln?}
Index: src/usr.sbin/sysinst/msg.mi.es
diff -u src/usr.sbin/sysinst/msg.mi.es:1.2.4.1 src/usr.sbin/sysinst/msg.mi.es:1.2.4.2
--- src/usr.sbin/sysinst/msg.mi.es:1.2.4.1 Tue Jan 20 09:42:31 2015
+++ src/usr.sbin/sysinst/msg.mi.es Wed May 13 17:04:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.es,v 1.2.4.1 2015/01/20 09:42:31 martin Exp $ */
+/* $NetBSD: msg.mi.es,v 1.2.4.2 2015/05/13 17:04:27 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -972,7 +972,7 @@ message Abandon {Abandonar instalaci�n}
message Abort_fetch {Abortar lectura}
message Device {Dispositivo}
message File_system {Sistema de archivos}
-message Select_IPv6_DNS_server { Seleccione servidor DNS de IPv6}
+message Select_DNS_server { Seleccione servidor DNS}
message other {otro }
message Perform_IPv6_autoconfiguration {�Realizar autoconfiguraci�n IPv6?}
message Perform_DHCP_autoconfiguration {�Realizar autoconfiguraci�n DHCP ?}
Index: src/usr.sbin/sysinst/msg.mi.fr
diff -u src/usr.sbin/sysinst/msg.mi.fr:1.2.4.1 src/usr.sbin/sysinst/msg.mi.fr:1.2.4.2
--- src/usr.sbin/sysinst/msg.mi.fr:1.2.4.1 Tue Jan 20 09:42:31 2015
+++ src/usr.sbin/sysinst/msg.mi.fr Wed May 13 17:04:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.fr,v 1.2.4.1 2015/01/20 09:42:31 martin Exp $ */
+/* $NetBSD: msg.mi.fr,v 1.2.4.2 2015/05/13 17:04:27 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1044,7 +1044,7 @@ message Abandon {Abandonner l'installati
message Abort_fetch {Annuler la r�cup�ration}
message Device {P�riph�rique}
message File_system {Syst�me de fichiers}
-message Select_IPv6_DNS_server { Choisissez un serveur de noms IPv6 :}
+message Select_DNS_server { Choisissez un serveur de noms :}
message other {autre }
message Perform_IPv6_autoconfiguration {Configurer automatiquement l'IPv6 ?}
message Perform_DHCP_autoconfiguration {Configurer automatiquement par DHCP ?}
Index: src/usr.sbin/sysinst/msg.mi.en
diff -u src/usr.sbin/sysinst/msg.mi.en:1.2.4.4 src/usr.sbin/sysinst/msg.mi.en:1.2.4.5
--- src/usr.sbin/sysinst/msg.mi.en:1.2.4.4 Wed May 6 23:37:10 2015
+++ src/usr.sbin/sysinst/msg.mi.en Wed May 13 17:04:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.en,v 1.2.4.4 2015/05/06 23:37:10 riz Exp $ */
+/* $NetBSD: msg.mi.en,v 1.2.4.5 2015/05/13 17:04:27 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -941,7 +941,7 @@ message Abandon {Abandon installation}
message Abort_fetch {Abort fetch}
message Device {Device}
message File_system {File system}
-message Select_IPv6_DNS_server { Select IPv6 DNS server}
+message Select_DNS_server { Select DNS server}
message other {other }
message Perform_IPv6_autoconfiguration {Perform IPv6 autoconfiguration?}
message Perform_DHCP_autoconfiguration {Perform DHCP autoconfiguration?}
Index: src/usr.sbin/sysinst/msg.mi.pl
diff -u src/usr.sbin/sysinst/msg.mi.pl:1.2.4.3 src/usr.sbin/sysinst/msg.mi.pl:1.2.4.4
--- src/usr.sbin/sysinst/msg.mi.pl:1.2.4.3 Mon Apr 6 01:41:50 2015
+++ src/usr.sbin/sysinst/msg.mi.pl Wed May 13 17:04:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.pl,v 1.2.4.3 2015/04/06 01:41:50 snj Exp $ */
+/* $NetBSD: msg.mi.pl,v 1.2.4.4 2015/05/13 17:04:27 snj Exp $ */
/* Based on english version: */
/* NetBSD: msg.mi.pl,v 1.36 2004/04/17 18:55:35 atatat Exp */
@@ -944,7 +944,7 @@ message Abandon {Przerwij instalacje}
message Abort_fetch {Przerwij pobieranie}
message Device {Urzadzenie}
message File_system {SystemPlikow}
-message Select_IPv6_DNS_server { Wybierz serwer nazw IPv6}
+message Select_DNS_server { Wybierz serwer nazw}
message other {inny }
message Perform_IPv6_autoconfiguration {Wykonac autokonfiguracje IPv6?}
message Perform_DHCP_autoconfiguration {Wykonac autkonfiguracje DHCP?}
