summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-02-28 13:11:19 +0000
committerOlivier Blin <oblin@mandriva.org>2005-02-28 13:11:19 +0000
commitf2a845100f8730f80a15d8adeecd094126a9bb02 (patch)
tree7a81e748963814a8b7f6797db01c8b477bfa6185 /perl-install
parent955d688a681a17c788b7660736aac104268cfac6 (diff)
downloaddrakx-f2a845100f8730f80a15d8adeecd094126a9bb02.tar
drakx-f2a845100f8730f80a15d8adeecd094126a9bb02.tar.gz
drakx-f2a845100f8730f80a15d8adeecd094126a9bb02.tar.bz2
drakx-f2a845100f8730f80a15d8adeecd094126a9bb02.tar.xz
drakx-f2a845100f8730f80a15d8adeecd094126a9bb02.zip
handle PEERYP and PEERNTPD too (#9982)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/network/netconnect.pm8
1 files changed, 7 insertions, 1 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 601236ab4..abdf9d737 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, $peerdns, $hotplug, $track_network_id, @fields); # lan config
+ my ($module, $auto_ip, $protocol, $onboot, $needhostname, $peerdns, $peeryp, $peerntpd, $hotplug, $track_network_id, @fields); # lan config
my $success = 1;
my $ethntf = {};
my $db_path = "/usr/share/apps/kppp/Provider";
@@ -991,6 +991,8 @@ Do you really want to reconfigure this device?"),
map { $_->{device} } detect_devices::pcmcia_probe()));
$needhostname = $ethntf->{NEEDHOSTNAME} !~ /no/;
$peerdns = $ethntf->{PEERDNS} !~ /no/;
+ $peeryp = $ethntf->{PEERYP} =~ /yes/;
+ $peerntpd = $ethntf->{PEERNTPD} =~ /yes/;
# blacklist bogus driver, enable ifplugd support else:
$ethntf->{MII_NOT_SUPPORTED} ||= $is_hotplug_blacklisted->();
$hotplug = !text2bool($ethntf->{MII_NOT_SUPPORTED});
@@ -1028,6 +1030,8 @@ notation (for example, 1.2.3.4).")),
{ 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 },
+ { text => N("Get YP server from DHCP"), val => \$peeryp, type => "bool", advanced => 1 },
+ { text => N("Get NTPD server from DHCP"), val => \$peerntpd, type => "bool", advanced => 1 },
),
];
},
@@ -1056,6 +1060,8 @@ notation (for example, 1.2.3.4).")),
$ethntf->{ONBOOT} = bool2yesno($onboot);
$ethntf->{NEEDHOSTNAME} = bool2yesno($needhostname);
$ethntf->{PEERDNS} = bool2yesno($peerdns);
+ $ethntf->{PEERYP} = bool2yesno($peeryp);
+ $ethntf->{PEERNTPD} = bool2yesno($peerntpd);
$ethntf->{MII_NOT_SUPPORTED} = bool2yesno(!$hotplug);
$ethntf->{HWADDR} = $track_network_id or delete $ethntf->{HWADDR};
$netc->{$_} = $ethntf->{DEVICE} foreach qw(NET_DEVICE NET_INTERFACE);