Module Name: src
Committed By: roy
Date: Mon Sep 22 19:01:02 UTC 2014
Modified Files:
src/usr.sbin/sysinst: menus.mi msg.mi.de msg.mi.en msg.mi.es msg.mi.fr
msg.mi.pl
Log Message:
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.5 -r1.6 src/usr.sbin/sysinst/menus.mi
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/msg.mi.de \
src/usr.sbin/sysinst/msg.mi.en src/usr.sbin/sysinst/msg.mi.es \
src/usr.sbin/sysinst/msg.mi.fr 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.5 src/usr.sbin/sysinst/menus.mi:1.6
--- src/usr.sbin/sysinst/menus.mi:1.5 Sat Sep 13 00:38:36 2014
+++ src/usr.sbin/sysinst/menus.mi Mon Sep 22 19:01:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: menus.mi,v 1.5 2014/09/13 00:38:36 roy Exp $ */
+/* $NetBSD: menus.mi,v 1.6 2014/09/22 19:01:02 roy Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -476,8 +476,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_namesvr, "2001:4860:4860::8888",
@@ -487,7 +507,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_namesvr, "2001:4860:4860::8844",
Index: src/usr.sbin/sysinst/msg.mi.de
diff -u src/usr.sbin/sysinst/msg.mi.de:1.4 src/usr.sbin/sysinst/msg.mi.de:1.5
--- src/usr.sbin/sysinst/msg.mi.de:1.4 Sat Sep 13 01:11:58 2014
+++ src/usr.sbin/sysinst/msg.mi.de Mon Sep 22 19:01:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.de,v 1.4 2014/09/13 01:11:58 roy Exp $ */
+/* $NetBSD: msg.mi.de,v 1.5 2014/09/22 19:01:02 roy Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1002,7 +1002,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_autoconfiguration {F�hren Sie die automatische Konfiguration?}
message Root_shell {Root-Shell}
Index: src/usr.sbin/sysinst/msg.mi.en
diff -u src/usr.sbin/sysinst/msg.mi.en:1.4 src/usr.sbin/sysinst/msg.mi.en:1.5
--- src/usr.sbin/sysinst/msg.mi.en:1.4 Sat Sep 13 01:11:58 2014
+++ src/usr.sbin/sysinst/msg.mi.en Mon Sep 22 19:01:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.en,v 1.4 2014/09/13 01:11:58 roy Exp $ */
+/* $NetBSD: msg.mi.en,v 1.5 2014/09/22 19:01:02 roy Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -943,7 +943,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_autoconfiguration {Perform autoconfiguration?}
message Root_shell {Root shell}
Index: src/usr.sbin/sysinst/msg.mi.es
diff -u src/usr.sbin/sysinst/msg.mi.es:1.4 src/usr.sbin/sysinst/msg.mi.es:1.5
--- src/usr.sbin/sysinst/msg.mi.es:1.4 Sat Sep 13 01:11:58 2014
+++ src/usr.sbin/sysinst/msg.mi.es Mon Sep 22 19:01:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.es,v 1.4 2014/09/13 01:11:58 roy Exp $ */
+/* $NetBSD: msg.mi.es,v 1.5 2014/09/22 19:01:02 roy Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -968,7 +968,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_autoconfiguration {�Realizar autoconfiguraci�n ?}
message Root_shell {Shell de root}
Index: src/usr.sbin/sysinst/msg.mi.fr
diff -u src/usr.sbin/sysinst/msg.mi.fr:1.4 src/usr.sbin/sysinst/msg.mi.fr:1.5
--- src/usr.sbin/sysinst/msg.mi.fr:1.4 Sat Sep 13 01:11:58 2014
+++ src/usr.sbin/sysinst/msg.mi.fr Mon Sep 22 19:01:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.fr,v 1.4 2014/09/13 01:11:58 roy Exp $ */
+/* $NetBSD: msg.mi.fr,v 1.5 2014/09/22 19:01:02 roy Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1040,7 +1040,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_autoconfiguration {Configurer automatiquement ?}
message Root_shell {Shell du compte "root"}
Index: src/usr.sbin/sysinst/msg.mi.pl
diff -u src/usr.sbin/sysinst/msg.mi.pl:1.4 src/usr.sbin/sysinst/msg.mi.pl:1.5
--- src/usr.sbin/sysinst/msg.mi.pl:1.4 Sat Sep 13 01:11:58 2014
+++ src/usr.sbin/sysinst/msg.mi.pl Mon Sep 22 19:01:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.pl,v 1.4 2014/09/13 01:11:58 roy Exp $ */
+/* $NetBSD: msg.mi.pl,v 1.5 2014/09/22 19:01:02 roy Exp $ */
/* Based on english version: */
/* NetBSD: msg.mi.pl,v 1.36 2004/04/17 18:55:35 atatat Exp */
@@ -940,7 +940,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_autoconfiguration {Wykonac autkonfiguracje?}
message Root_shell {Powloka root'a}
