summaryrefslogtreecommitdiffstats
path: root/lib/network/connection/ethernet.pm
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-04-03 09:56:14 +0000
committerOlivier Blin <oblin@mandriva.com>2008-04-03 09:56:14 +0000
commit7b03a10c40b399fdf9d3499d1b22e13ff6c5860b (patch)
tree2213a37172eeb1e23c5b647316c2976bf7b361a4 /lib/network/connection/ethernet.pm
parente4bb8e7bbfc90c7c8d2c27e703b15dd7231105e5 (diff)
downloaddrakx-net-7b03a10c40b399fdf9d3499d1b22e13ff6c5860b.tar
drakx-net-7b03a10c40b399fdf9d3499d1b22e13ff6c5860b.tar.gz
drakx-net-7b03a10c40b399fdf9d3499d1b22e13ff6c5860b.tar.bz2
drakx-net-7b03a10c40b399fdf9d3499d1b22e13ff6c5860b.tar.xz
drakx-net-7b03a10c40b399fdf9d3499d1b22e13ff6c5860b.zip
do not set RESOLV_MODS to "yes" if PEERDNS is "yes" for ethernet connections
Diffstat (limited to 'lib/network/connection/ethernet.pm')
-rw-r--r--lib/network/connection/ethernet.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/network/connection/ethernet.pm b/lib/network/connection/ethernet.pm
index 121aaf5..0c9f3c1 100644
--- a/lib/network/connection/ethernet.pm
+++ b/lib/network/connection/ethernet.pm
@@ -250,7 +250,7 @@ sub build_ifcfg_settings {
NEEDHOSTNAME => bool2yesno($self->{address}{needhostname}),
PEERYP => bool2yesno($self->{address}{peeryp}),
PEERDNS => bool2yesno($self->{address}{peerdns}),
- RESOLV_MODS => bool2yesno($self->{address}{dns1} || $self->{address}{dns2}),
+ RESOLV_MODS => bool2yesno(!$self->{address}{peerdns} && ($self->{address}{dns1} || $self->{address}{dns2})),
PEERNTPD => bool2yesno($self->{address}{peerntpd}),
DHCP_CLIENT => $self->{address}{dhcp_client},
DHCP_HOSTNAME => $self->{address}{dhcp_hostname},