Module Name: src
Committed By: roy
Date: Sat Sep 13 01:11:58 UTC 2014
Modified Files:
src/usr.sbin/sysinst: msg.mi.de msg.mi.en msg.mi.es msg.mi.fr msg.mi.pl
net.c
Log Message:
Change the display order so it's protocol agnostic at the top,
then IPv4 then IPv6.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 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
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/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/usr.sbin/sysinst/msg.mi.de
diff -u src/usr.sbin/sysinst/msg.mi.de:1.3 src/usr.sbin/sysinst/msg.mi.de:1.4
--- src/usr.sbin/sysinst/msg.mi.de:1.3 Fri Aug 15 22:58:11 2014
+++ src/usr.sbin/sysinst/msg.mi.de Sat Sep 13 01:11:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.de,v 1.3 2014/08/15 22:58:11 jmcneill Exp $ */
+/* $NetBSD: msg.mi.de,v 1.4 2014/09/13 01:11:58 roy Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -547,9 +547,6 @@ message net_srv_ip
message net_mask
{IPv4-Netzmaske}
-message net_namesrv6
-{IPv6-Nameserver}
-
message net_namesrv
{IPv4-Nameserver}
@@ -564,12 +561,12 @@ message netok
DNS-Domain: %s
Hostname: %s
+Nameserver: %s
Netzwerkadapter: %s
+Verbindungstyp: %s
IP-Adresse: %s
Netzmaske: %s
-IPv4-Nameserver: %s
IPv4-Gateway: %s
-Verbindungstyp: %s
}
message netok_slip
@@ -577,19 +574,18 @@ message netok_slip
DNS-Domain: %s
Hostname: %s
+Nameserver: %s
Netzwerkadapter: %s
+Verbindungstyp: %s
IP-Adresse: %s
IP-Adresse des Servers: %s
Netzmaske: %s
-IPv4-Nameserver: %s
IPv4-Gateway: %s
-Verbindungstyp: %s
}
message netokv6
{
IPv6-Autokonfiguration: %s
-IPv6-Nameserver: %s
}
message netok_ok
@@ -1008,8 +1004,7 @@ message Device {Ger�t}
message File_system {Dateisystem}
message Select_IPv6_DNS_server { Ausw�hlen eines IPv6 DNS Servers}
message other {andere }
-message Perform_IPv6_autoconfiguration {IPv6 automatisch konfigurieren?}
-message Perform_DHCP_autoconfiguration {Konfiguration per DHCP ermitteln?}
+message Perform_autoconfiguration {F�hren Sie die automatische Konfiguration?}
message Root_shell {Root-Shell}
message User_shell {User-Shell}
message Color_scheme {Farbschema}
Index: src/usr.sbin/sysinst/msg.mi.en
diff -u src/usr.sbin/sysinst/msg.mi.en:1.3 src/usr.sbin/sysinst/msg.mi.en:1.4
--- src/usr.sbin/sysinst/msg.mi.en:1.3 Fri Aug 15 22:58:11 2014
+++ src/usr.sbin/sysinst/msg.mi.en Sat Sep 13 01:11:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.en,v 1.3 2014/08/15 22:58:11 jmcneill Exp $ */
+/* $NetBSD: msg.mi.en,v 1.4 2014/09/13 01:11:58 roy Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -529,11 +529,8 @@ message net_srv_ip
message net_mask
{IPv4 Netmask}
-message net_namesrv6
-{IPv6 name server}
-
message net_namesrv
-{IPv4 name server}
+{Your name server}
message net_defroute
{IPv4 gateway}
@@ -546,12 +543,12 @@ message netok
DNS Domain: %s
Host Name: %s
+Nameserver: %s
Primary Interface: %s
+Media type: %s
Host IP: %s
Netmask: %s
-IPv4 Nameserver: %s
IPv4 Gateway: %s
-Media type: %s
}
message netok_slip
@@ -559,18 +556,17 @@ message netok_slip
DNS Domain: %s
Host Name: %s
+Nameserver: %s
Primary Interface: %s
+Media type: %s
Host IP: %s
Server IP: %s
Netmask: %s
-IPv4 Nameserver: %s
IPv4 Gateway: %s
-Media type: %s
}
message netokv6
{IPv6 autoconf: %s
-IPv6 Nameserver: %s
}
message netok_ok
@@ -949,8 +945,7 @@ message Device {Device}
message File_system {File system}
message Select_IPv6_DNS_server { Select IPv6 DNS server}
message other {other }
-message Perform_IPv6_autoconfiguration {Perform IPv6 autoconfiguration?}
-message Perform_DHCP_autoconfiguration {Perform DHCP autoconfiguration?}
+message Perform_autoconfiguration {Perform autoconfiguration?}
message Root_shell {Root shell}
message User_shell {User shell}
message Color_scheme {Color scheme}
Index: src/usr.sbin/sysinst/msg.mi.es
diff -u src/usr.sbin/sysinst/msg.mi.es:1.3 src/usr.sbin/sysinst/msg.mi.es:1.4
--- src/usr.sbin/sysinst/msg.mi.es:1.3 Fri Aug 15 22:58:11 2014
+++ src/usr.sbin/sysinst/msg.mi.es Sat Sep 13 01:11:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.es,v 1.3 2014/08/15 22:58:11 jmcneill Exp $ */
+/* $NetBSD: msg.mi.es,v 1.4 2014/09/13 01:11:58 roy Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -542,9 +542,6 @@ message net_srv_ip
message net_mask
{M�scara de red IPv4}
-message net_namesrv6
-{Servidor de nombres IPv6}
-
message net_namesrv
{Servidor de nombres IPv4}
@@ -559,12 +556,12 @@ message netok
Dominio DNS: %s
Nombre de m�quina: %s
+Serv de nombres: %s
Interfaz primaria: %s
+Tipo de medio: %s
IP de la m�quina: %s
M�scara de red: %s
-Serv de nombres IPv4: %s
Pasarela IPv4: %s
-Tipo de medio: %s
}
message netok_slip
@@ -572,18 +569,17 @@ message netok_slip
Dominio DNS: %s
Nombre de la m�quina: %s
+Serv de nombres: %s
Interfaz primaria: %s
+Tipo de medio: %s
IP de la m�quina: %s
IP del servidor: %s
M�scara de red: %s
-Serv de nombres IPv4: %s
Pasarela IPv4: %s
-Tipo de medio: %s
}
message netokv6
{IPv6 autoconf: %s
-Serv de nombres IPv6: %s
}
message netok_ok
@@ -974,8 +970,7 @@ message Device {Dispositivo}
message File_system {Sistema de archivos}
message Select_IPv6_DNS_server { Seleccione servidor DNS de IPv6}
message other {otro }
-message Perform_IPv6_autoconfiguration {�Realizar autoconfiguraci�n IPv6?}
-message Perform_DHCP_autoconfiguration {�Realizar autoconfiguraci�n DHCP ?}
+message Perform_autoconfiguration {�Realizar autoconfiguraci�n ?}
message Root_shell {Shell de root}
message Color_scheme {Combinaci�n de colores}
message White_on_black {Blanco sobre negro}
Index: src/usr.sbin/sysinst/msg.mi.fr
diff -u src/usr.sbin/sysinst/msg.mi.fr:1.3 src/usr.sbin/sysinst/msg.mi.fr:1.4
--- src/usr.sbin/sysinst/msg.mi.fr:1.3 Fri Aug 15 22:58:11 2014
+++ src/usr.sbin/sysinst/msg.mi.fr Sat Sep 13 01:11:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.fr,v 1.3 2014/08/15 22:58:11 jmcneill Exp $ */
+/* $NetBSD: msg.mi.fr,v 1.4 2014/09/13 01:11:58 roy Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -553,9 +553,6 @@ message net_srv_ip
message net_mask
{Votre masque de r�seau (IPv4)}
-message net_namesrv6
-{Adresse IPv6 de votre serveur de noms (DNS)}
-
message net_namesrv
{Adresse IPv4 de votre serveur de noms (DNS)}
@@ -568,33 +565,32 @@ message net_media
message netok
{Vous avez sp�cifi� les valeurs suivantes :
-Nom de domaine (DNS) : %s
-Nom d'ordinateur : %s
-Interface r�seau : %s
-Adresse IPv4 : %s
-Masque de sous-r�seau : %s
-Adresse IPv4 du serveur de noms : %s
-Adresse IPv4 de la passerelle : %s
-Type de r�seau (m�dia) %s
+Nom de domaine (DNS) : %s
+Nom d'ordinateur : %s
+Adresse du serveur de noms : %s
+Interface r�seau : %s
+Type de r�seau (m�dia) %s
+Adresse IPv4 : %s
+Masque de sous-r�seau : %s
+Adresse IPv4 de la passerelle : %s
}
message netok_slip
{Vous avez sp�cifi� les valeurs suivantes. �tes-vous d'accord ?
-Nom de domaine (DNS) : %s
-Nom d'ordinateur : %s
-Interface r�seau : %s
-Adresse IPv4 : %s
-Adresse IPv4 du serveur : %s
-Masque de sous-r�seau : %s
-Adresse IPv4 du serveur de noms : %s
-Adresse IPv4 de la passerelle : %s
-Type de r�seau (m�dia) : %s
+Nom de domaine (DNS) : %s
+Nom d'ordinateur : %s
+Adresse du serveur de noms : %s
+Interface r�seau : %s
+Type de r�seau (m�dia) : %s
+Adresse IPv4 : %s
+Adresse IPv4 du serveur : %s
+Masque de sous-r�seau : %s
+Adresse IPv4 de la passerelle : %s
}
message netokv6
-{Auto-configuration IPv6 : %s
-Adresse du serveur de noms IPv6 : %s
+{Auto-configuration IPv6 : %s
}
message netok_ok
@@ -1046,8 +1042,7 @@ message Device {P�riph�rique}
message File_system {Syst�me de fichiers}
message Select_IPv6_DNS_server { Choisissez un serveur de noms IPv6 :}
message other {autre }
-message Perform_IPv6_autoconfiguration {Configurer automatiquement l'IPv6 ?}
-message Perform_DHCP_autoconfiguration {Configurer automatiquement par DHCP ?}
+message Perform_autoconfiguration {Configurer automatiquement ?}
message Root_shell {Shell du compte "root"}
message Color_scheme {Jeu de couleurs}
message White_on_black {Blanc sur noir}
Index: src/usr.sbin/sysinst/msg.mi.pl
diff -u src/usr.sbin/sysinst/msg.mi.pl:1.3 src/usr.sbin/sysinst/msg.mi.pl:1.4
--- src/usr.sbin/sysinst/msg.mi.pl:1.3 Fri Aug 15 22:58:11 2014
+++ src/usr.sbin/sysinst/msg.mi.pl Sat Sep 13 01:11:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.pl,v 1.3 2014/08/15 22:58:11 jmcneill Exp $ */
+/* $NetBSD: msg.mi.pl,v 1.4 2014/09/13 01:11:58 roy Exp $ */
/* Based on english version: */
/* NetBSD: msg.mi.pl,v 1.36 2004/04/17 18:55:35 atatat Exp */
@@ -523,9 +523,6 @@ message net_srv_ip
message net_mask
{Maska podsieci IPv4}
-message net_namesrv6
-{Serwer nazw IPv6}
-
message net_namesrv
{Serwer nazw IPv4}
@@ -540,12 +537,12 @@ message netok
Domena DNS: %s
Nazwa hosta: %s
+Serwer nazw: %s
Podstawowy interfejs: %s
+Medium sieciowe: %s
Twoj adres IP: %s
Maska podsieci: %s
-Serwer nazw IPv4: %s
Bramka IPv4: %s
-Medium sieciowe: %s
}
message netok_slip
@@ -553,18 +550,17 @@ message netok_slip
Domena DNS: %s
Nazwa hosta: %s
+Serwer nazw: %s
Podstawowy interfejs: %s
+Medium sieciowe: %s
Twoj adres IP: %s
Adres IP serwera: %s
Maska podsieci: %s
-Serwer nazw IPv4: %s
Bramka IPv4: %s
-Medium sieciowe: %s
}
message netokv6
{Autkonfiguracja IPv6: %s
-Serwer nazw IPv6: %s
}
message netok_ok
@@ -946,8 +942,7 @@ message Device {Urzadzenie}
message File_system {SystemPlikow}
message Select_IPv6_DNS_server { Wybierz serwer nazw IPv6}
message other {inny }
-message Perform_IPv6_autoconfiguration {Wykonac autokonfiguracje IPv6?}
-message Perform_DHCP_autoconfiguration {Wykonac autkonfiguracje DHCP?}
+message Perform_autoconfiguration {Wykonac autkonfiguracje?}
message Root_shell {Powloka root'a}
message Color_scheme {Kolorystyka}
message White_on_black {Bia�y na czarnym}
Index: src/usr.sbin/sysinst/net.c
diff -u src/usr.sbin/sysinst/net.c:1.10 src/usr.sbin/sysinst/net.c:1.11
--- src/usr.sbin/sysinst/net.c:1.10 Sat Sep 13 00:38:36 2014
+++ src/usr.sbin/sysinst/net.c Sat Sep 13 01:11:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: net.c,v 1.10 2014/09/13 00:38:36 roy Exp $ */
+/* $NetBSD: net.c,v 1.11 2014/09/13 01:11:58 roy Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -729,20 +729,22 @@ again:
/* confirm the setting */
if (slip)
- msg_display(MSG_netok_slip, net_domain, net_host, net_dev,
- *net_ip == '\0' ? "<none>" : net_ip,
- *net_srv_ip == '\0' ? "<none>" : net_srv_ip,
- *net_mask == '\0' ? "<none>" : net_mask,
- *net_namesvr == '\0' ? "<none>" : net_namesvr,
- *net_defroute == '\0' ? "<none>" : net_defroute,
- *net_media == '\0' ? "<default>" : net_media);
+ msg_display(MSG_netok_slip, net_domain, net_host,
+ *net_namesvr == '\0' ? "<none>" : net_namesvr,
+ net_dev,
+ *net_media == '\0' ? "<default>" : net_media,
+ *net_ip == '\0' ? "<none>" : net_ip,
+ *net_srv_ip == '\0' ? "<none>" : net_srv_ip,
+ *net_mask == '\0' ? "<none>" : net_mask,
+ *net_defroute == '\0' ? "<none>" : net_defroute);
else
- msg_display(MSG_netok, net_domain, net_host, net_dev,
- *net_ip == '\0' ? "<none>" : net_ip,
- *net_mask == '\0' ? "<none>" : net_mask,
- *net_namesvr == '\0' ? "<none>" : net_namesvr,
- *net_defroute == '\0' ? "<none>" : net_defroute,
- *net_media == '\0' ? "<default>" : net_media);
+ msg_display(MSG_netok, net_domain, net_host,
+ *net_namesvr == '\0' ? "<none>" : net_namesvr,
+ net_dev,
+ *net_media == '\0' ? "<default>" : net_media,
+ *net_ip == '\0' ? "<none>" : net_ip,
+ *net_mask == '\0' ? "<none>" : net_mask,
+ *net_defroute == '\0' ? "<none>" : net_defroute);
#ifdef INET6
msg_display_add(MSG_netokv6,
!is_v6kernel() ? "<not supported>" :
@@ -1163,7 +1165,7 @@ config_dhcp(char *inter)
if (!file_mode_match(DHCPCD, S_IFREG))
return 0;
- process_menu(MENU_yesno, deconst(MSG_Perform_DHCP_autoconfiguration));
+ process_menu(MENU_yesno, deconst(MSG_Perform_autoconfiguration));
if (yesno) {
/* spawn off dhcpcd and wait for parent to exit */
dhcpautoconf = run_program(RUN_DISPLAY | RUN_PROGRESS,
