diff options
| author | David Cantrell <dcantrell@redhat.com> | 2007-01-11 17:54:46 +0000 |
|---|---|---|
| committer | David Cantrell <dcantrell@redhat.com> | 2007-01-11 17:54:46 +0000 |
| commit | 3fff3f951268b74e66948f43351944cd0988f0eb (patch) | |
| tree | 1464fe84133c7497804ec00ed6f0c914d97709ec | |
| parent | fa1325619323d9eac8dac0af1f71b6e3f0ad28c9 (diff) | |
| download | anaconda-3fff3f951268b74e66948f43351944cd0988f0eb.tar.gz anaconda-3fff3f951268b74e66948f43351944cd0988f0eb.tar.xz anaconda-3fff3f951268b74e66948f43351944cd0988f0eb.zip | |
* ui/netpostconfig.glade: Note DHCP for IPv6 as 'DHCPv6'. Remove
'RFC 2461' from the text for the automatic neighbor discovery
option.
* loader/net.c (configureTCPIP): Use DHCPV6_METHOD_STR for the
DHCP on IPv6 checkbox.
* loader/net.h: Define DHCPV6_METHOD_STR. Remove 'RFC 2461' from
the AUTO_METHOD_STR macro.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | loader2/net.c | 2 | ||||
| -rw-r--r-- | loader2/net.h | 3 | ||||
| -rw-r--r-- | ui/netpostconfig.glade | 4 |
4 files changed, 16 insertions, 4 deletions
@@ -1,3 +1,14 @@ +2007-01-11 David Cantrell <dcantrell@redhat.com> + + * ui/netpostconfig.glade: Note DHCP for IPv6 as 'DHCPv6'. Remove + 'RFC 2461' from the text for the automatic neighbor discovery + option. + + * loader/net.c (configureTCPIP): Use DHCPV6_METHOD_STR for the + DHCP on IPv6 checkbox. + * loader/net.h: Define DHCPV6_METHOD_STR. Remove 'RFC 2461' from + the AUTO_METHOD_STR macro. + 2007-01-10 Jeremy Katz <katzj@redhat.com> * anaconda.spec: Bump version. diff --git a/loader2/net.c b/loader2/net.c index 6f94ee071..6cdcb0d7f 100644 --- a/loader2/net.c +++ b/loader2/net.c @@ -724,7 +724,7 @@ int configureTCPIP(char * device, struct networkDeviceConfig * cfg, ipv6Checkbox = newtCheckbox(-1, -1, _("Enable IPv6 support"), opts->ipv6Choice, NULL, &(opts->ipv6Choice)); v6Method[0] = newtRadiobutton(-1, -1, AUTO_METHOD_STR, 1, NULL); - v6Method[1] = newtRadiobutton(-1, -1, DHCP_METHOD_STR, 0, v6Method[0]); + v6Method[1] = newtRadiobutton(-1, -1, DHCPV6_METHOD_STR, 0, v6Method[0]); v6Method[2] = newtRadiobutton(-1, -1, MANUAL_METHOD_STR, 0, v6Method[1]); /* button bar at the bottom of the window */ diff --git a/loader2/net.h b/loader2/net.h index 410e70d47..506e2e210 100644 --- a/loader2/net.h +++ b/loader2/net.h @@ -8,8 +8,9 @@ #include <pump.h> #define DHCP_METHOD_STR _("Dynamic IP configuration (DHCP)") +#define DHCPV6_METHOD_STR _("Dynamic IP configuration (DHCPv6)") #define MANUAL_METHOD_STR _("Manual configuration") -#define AUTO_METHOD_STR _("Automatic neighbor discovery (RFC 2461)") +#define AUTO_METHOD_STR _("Automatic neighbor discovery") /* generic names for array index positions in net.c */ enum { IPV4, IPV6 }; diff --git a/ui/netpostconfig.glade b/ui/netpostconfig.glade index 7b2aae655..4b481057e 100644 --- a/ui/netpostconfig.glade +++ b/ui/netpostconfig.glade @@ -466,7 +466,7 @@ <widget class="GtkRadioButton" id="auto_ipv6"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Automatic neighbor discovery (RFC 2461)</property> + <property name="label" translatable="yes">Automatic neighbor discovery</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -499,7 +499,7 @@ <widget class="GtkRadioButton" id="dhcp_ipv6"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Dynamic IP configuration (DHCP)</property> + <property name="label" translatable="yes">Dynamic IP configuration (DHCPv6)</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> |