Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-7]: src/usr.sbin/sysinst Pull up following revision(s) (requested...
details: https://anonhg.NetBSD.org/src/rev/8aeec097679d
branches: netbsd-7
changeset: 799313:8aeec097679d
user: snj <snj%NetBSD.org@localhost>
date: Wed May 13 17:04:27 2015 +0000
description:
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.
diffstat:
usr.sbin/sysinst/menus.mi | 28 ++++++++++++++++++++++++----
usr.sbin/sysinst/msg.mi.de | 4 ++--
usr.sbin/sysinst/msg.mi.en | 4 ++--
usr.sbin/sysinst/msg.mi.es | 4 ++--
usr.sbin/sysinst/msg.mi.fr | 4 ++--
usr.sbin/sysinst/msg.mi.pl | 4 ++--
6 files changed, 34 insertions(+), 14 deletions(-)
diffs (139 lines):
diff -r 2479938fb36b -r 8aeec097679d usr.sbin/sysinst/menus.mi
--- a/usr.sbin/sysinst/menus.mi Wed May 13 14:14:10 2015 +0000
+++ b/usr.sbin/sysinst/menus.mi Wed May 13 17:04:27 2015 +0000
@@ -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 @@
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 @@
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",
diff -r 2479938fb36b -r 8aeec097679d usr.sbin/sysinst/msg.mi.de
--- a/usr.sbin/sysinst/msg.mi.de Wed May 13 14:14:10 2015 +0000
+++ b/usr.sbin/sysinst/msg.mi.de Wed May 13 17:04:27 2015 +0000
@@ -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 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?}
diff -r 2479938fb36b -r 8aeec097679d usr.sbin/sysinst/msg.mi.en
--- a/usr.sbin/sysinst/msg.mi.en Wed May 13 14:14:10 2015 +0000
+++ b/usr.sbin/sysinst/msg.mi.en Wed May 13 17:04:27 2015 +0000
@@ -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 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?}
diff -r 2479938fb36b -r 8aeec097679d usr.sbin/sysinst/msg.mi.es
--- a/usr.sbin/sysinst/msg.mi.es Wed May 13 14:14:10 2015 +0000
+++ b/usr.sbin/sysinst/msg.mi.es Wed May 13 17:04:27 2015 +0000
@@ -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 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 ?}
diff -r 2479938fb36b -r 8aeec097679d usr.sbin/sysinst/msg.mi.fr
--- a/usr.sbin/sysinst/msg.mi.fr Wed May 13 14:14:10 2015 +0000
+++ b/usr.sbin/sysinst/msg.mi.fr Wed May 13 17:04:27 2015 +0000
@@ -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 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 ?}
diff -r 2479938fb36b -r 8aeec097679d usr.sbin/sysinst/msg.mi.pl
--- a/usr.sbin/sysinst/msg.mi.pl Wed May 13 14:14:10 2015 +0000
+++ b/usr.sbin/sysinst/msg.mi.pl Wed May 13 17:04:27 2015 +0000
@@ -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 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?}
Home |
Main Index |
Thread Index |
Old Index