diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-08-02 06:52:22 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-08-02 06:52:22 +0000 |
| commit | db02946e5f58e282d5056a57d50208022f2fc796 (patch) | |
| tree | 7755a8abb9c238d4e6405c546c516a7e2458114c /perl-install/network/network.pm | |
| parent | 16c8467a9f303721a889bf4248ae02ad178fa471 (diff) | |
| download | drakx-db02946e5f58e282d5056a57d50208022f2fc796.tar drakx-db02946e5f58e282d5056a57d50208022f2fc796.tar.gz drakx-db02946e5f58e282d5056a57d50208022f2fc796.tar.bz2 drakx-db02946e5f58e282d5056a57d50208022f2fc796.tar.xz drakx-db02946e5f58e282d5056a57d50208022f2fc796.zip | |
introduce ->ensure_binary_is_installed and use it
Diffstat (limited to 'perl-install/network/network.pm')
| -rw-r--r-- | perl-install/network/network.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm index 1af6b6a44..06e86155c 100644 --- a/perl-install/network/network.pm +++ b/perl-install/network/network.pm @@ -410,7 +410,7 @@ sub configureNetwork2 { my ($in, $_prefix, $netc, $intf) = @_; my $etc = "$::prefix/etc"; if (!$::testing) { - $netc->{wireless_eth} and $in->do_pkgs->ensure_is_installed('wireless-tools', '/sbin/iwconfig', 'auto'); + $netc->{wireless_eth} and $in->do_pkgs->ensure_binary_is_installed('wireless-tools', 'iwconfig', 'auto'); write_conf("$etc/sysconfig/network", $netc); write_resolv_conf("$etc/resolv.conf", $netc) if ! $netc->{DHCP}; write_interface_conf("$etc/sysconfig/network-scripts/ifcfg-$_->{DEVICE}", $_, $netc, $::prefix) foreach grep { $_->{DEVICE} ne 'ppp0' } values %$intf; @@ -419,8 +419,8 @@ sub configureNetwork2 { any { $_->{BOOTPROTO} eq "dhcp" } values %$intf and $in->do_pkgs->install($netc->{dhcp_client} || 'dhcp-client'); 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'); + $in->do_pkgs->ensure_binary_is_installed('tmdns', 'tmdns', 'auto') if !$in->do_pkgs->is_installed('bind'); + $in->do_pkgs->ensure_binary_is_installed('zcip', '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'); |