summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederic Lepied <flepied@mandriva.com>2003-03-04 20:32:52 +0000
committerFrederic Lepied <flepied@mandriva.com>2003-03-04 20:32:52 +0000
commit8dcab485d47f47d1ae42476a8e53f4f315dddc6a (patch)
treebcb1021512cbb88223fbf8843b4965d95fd8f713
parentcda9ce8f63d947ed24b1d9518079b4765c492534 (diff)
downloaddrakx-backup-do-not-use-8dcab485d47f47d1ae42476a8e53f4f315dddc6a.tar
drakx-backup-do-not-use-8dcab485d47f47d1ae42476a8e53f4f315dddc6a.tar.gz
drakx-backup-do-not-use-8dcab485d47f47d1ae42476a8e53f4f315dddc6a.tar.bz2
drakx-backup-do-not-use-8dcab485d47f47d1ae42476a8e53f4f315dddc6a.tar.xz
drakx-backup-do-not-use-8dcab485d47f47d1ae42476a8e53f4f315dddc6a.zip
install tmdns only when bind isn't installed
-rw-r--r--perl-install/network/network.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index 8bf1149da..49f79fb89 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -474,6 +474,7 @@ sub read_all_conf {
}
$netcnx->{type} or probe_netcnx_type($prefix, $netc, $intf, $netcnx);
}
+
sub probe_netcnx_type {
my ($prefix, $_netc, $intf, $netcnx) = @_;
#- try to probe $netcnx->{type} which is used almost everywhere.
@@ -546,7 +547,8 @@ 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->install(qw(zcip tmdns));
+ $in->do_pkgs->install(qw(tmdns)) if !$in->do_pkgs->is_installed('bind');
+ $in->do_pkgs->install(qw(zcip));
$netc->{ZEROCONF_HOSTNAME} and write_zeroconf("$etc/tmdns.conf", $netc->{ZEROCONF_HOSTNAME});
any { $_->{BOOTPROTO} =~ /^(pump|bootp)$/ } values %$intf and $in->do_pkgs->install('pump');