summaryrefslogtreecommitdiffstats
path: root/perl-install/network
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-01-16 23:06:29 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-01-16 23:06:29 +0000
commit8865147ea760c81e1717fd73bb5e66911630dc73 (patch)
tree1f4ff5d88436f929d9b27d441a083481d29f855f /perl-install/network
parent52de28e8236a8dcbdab261de4fa451b812823b43 (diff)
downloaddrakx-8865147ea760c81e1717fd73bb5e66911630dc73.tar
drakx-8865147ea760c81e1717fd73bb5e66911630dc73.tar.gz
drakx-8865147ea760c81e1717fd73bb5e66911630dc73.tar.bz2
drakx-8865147ea760c81e1717fd73bb5e66911630dc73.tar.xz
drakx-8865147ea760c81e1717fd73bb5e66911630dc73.zip
do not install zeroconf if no zeroconf hostname was typed in (we may add a
USE_ZEROCONF variable to /etc/sysconfig/network instead)
Diffstat (limited to 'perl-install/network')
-rw-r--r--perl-install/network/network.pm8
1 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index dbe536810..a44ef6b38 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -424,9 +424,11 @@ sub configureNetwork2 {
add2hosts("$etc/hosts", "localhost", "127.0.0.1");
any { $_->{BOOTPROTO} eq "dhcp" } values %$intf and $in->do_pkgs->install($netc->{dhcp_client} || 'dhcp-client');
- $in->do_pkgs->ensure_is_installed('tmdns', '/sbin/tmdns', 'auto') if !$in->do_pkgs->is_installed('bind');
- $in->do_pkgs->ensure_is_installed('zcip', '/sbin/zcip', 'auto');
- $netc->{ZEROCONF_HOSTNAME} and write_zeroconf("$etc/tmdns.conf", $netc->{ZEROCONF_HOSTNAME});
+ if ($netc->{ZEROCONF_HOSTNAME}) {
+ $in->do_pkgs->ensure_is_installed('tmdns', '/sbin/tmdns', 'auto') if !$in->do_pkgs->is_installed('bind');
+ $in->do_pkgs->ensure_is_installed('zcip', '/sbin/zcip', 'auto');
+ write_zeroconf("$etc/tmdns.conf", $netc->{ZEROCONF_HOSTNAME});
+ } else { run_program::rooted($::prefix, "chkconfig", "--del", $_) foreach qw(tmdns zcip) } # disable zeroconf
any { $_->{BOOTPROTO} =~ /^(pump|bootp)$/ } values %$intf and $in->do_pkgs->install('pump');
}