summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-02-28 11:34:06 +0000
committerOlivier Blin <oblin@mandriva.org>2005-02-28 11:34:06 +0000
commit4889288e5d2654e6127a9606de81f81da4b282f1 (patch)
treef2d00382c5e04bf0e03acc2f51457b50455c71ea
parent6b76f620aec8e1d0e187c7c75d5dcf0449535d02 (diff)
downloaddrakx-4889288e5d2654e6127a9606de81f81da4b282f1.tar
drakx-4889288e5d2654e6127a9606de81f81da4b282f1.tar.gz
drakx-4889288e5d2654e6127a9606de81f81da4b282f1.tar.bz2
drakx-4889288e5d2654e6127a9606de81f81da4b282f1.tar.xz
drakx-4889288e5d2654e6127a9606de81f81da4b282f1.zip
peerdns support (and assorted space fixes)
-rw-r--r--perl-install/network/netconnect.pm13
1 files changed, 8 insertions, 5 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 053579875..601236ab4 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -89,7 +89,7 @@ sub real_main {
my ($isdn, $isdn_name, $isdn_type, %isdn_cards, @isdn_dial_methods);
my $my_isdn = join('', N("Manual choice"), " (", N("Internal ISDN card"), ")");
my ($ndiswrapper_driver, $ndiswrapper_inf_file);
- my ($module, $auto_ip, $protocol, $onboot, $needhostname, $hotplug, $track_network_id, @fields); # lan config
+ my ($module, $auto_ip, $protocol, $onboot, $needhostname, $peerdns, $hotplug, $track_network_id, @fields); # lan config
my $success = 1;
my $ethntf = {};
my $db_path = "/usr/share/apps/kppp/Provider";
@@ -987,9 +987,10 @@ Do you really want to reconfigure this device?"),
lan_intf =>
{
pre => sub {
- $onboot = $ethntf->{ONBOOT} ? $ethntf->{ONBOOT} =~ /yes/ : bool2yesno(!member($ethntf->{DEVICE},
+ $onboot = $ethntf->{ONBOOT} ? $ethntf->{ONBOOT} =~ /yes/ : bool2yesno(!member($ethntf->{DEVICE},
map { $_->{device} } detect_devices::pcmcia_probe()));
- $needhostname = $ethntf->{NEEDHOSTNAME} !~ /no/;
+ $needhostname = $ethntf->{NEEDHOSTNAME} !~ /no/;
+ $peerdns = $ethntf->{PEERDNS} !~ /no/;
# blacklist bogus driver, enable ifplugd support else:
$ethntf->{MII_NOT_SUPPORTED} ||= $is_hotplug_blacklisted->();
$hotplug = !text2bool($ethntf->{MII_NOT_SUPPORTED});
@@ -1023,9 +1024,10 @@ notation (for example, 1.2.3.4).")),
if_($netcnx->{type} eq "lan",
{ text => N("Start at boot"), val => \$onboot, type => "bool" },
),
- if_($auto_ip,
- { label => N("DHCP client"), val => \$netc->{dhcp_client},
+ if_($auto_ip,
+ { label => N("DHCP client"), val => \$netc->{dhcp_client},
list => [ qw(dhcp-client dhcpcd pump dhcpxd) ], advanced => 1 },
+ { text => N("Get DNS servers from DHCP"), val => \$peerdns, type => "bool", advanced => 1 },
),
];
},
@@ -1053,6 +1055,7 @@ notation (for example, 1.2.3.4).")),
post => sub {
$ethntf->{ONBOOT} = bool2yesno($onboot);
$ethntf->{NEEDHOSTNAME} = bool2yesno($needhostname);
+ $ethntf->{PEERDNS} = bool2yesno($peerdns);
$ethntf->{MII_NOT_SUPPORTED} = bool2yesno(!$hotplug);
$ethntf->{HWADDR} = $track_network_id or delete $ethntf->{HWADDR};
$netc->{$_} = $ethntf->{DEVICE} foreach qw(NET_DEVICE NET_INTERFACE);