summaryrefslogtreecommitdiffstats
path: root/perl-install/network/ethernet.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-08-08 18:26:31 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-08-08 18:26:31 +0000
commit157fe13a76e798fa8af5f79c792c704a593f6c93 (patch)
tree7dded9e6761033f09709722965d15b14ce7825bd /perl-install/network/ethernet.pm
parentb4fd82d0ced6a2118a51b060d2eff8c4f179b52b (diff)
downloaddrakx-backup-do-not-use-157fe13a76e798fa8af5f79c792c704a593f6c93.tar
drakx-backup-do-not-use-157fe13a76e798fa8af5f79c792c704a593f6c93.tar.gz
drakx-backup-do-not-use-157fe13a76e798fa8af5f79c792c704a593f6c93.tar.bz2
drakx-backup-do-not-use-157fe13a76e798fa8af5f79c792c704a593f6c93.tar.xz
drakx-backup-do-not-use-157fe13a76e798fa8af5f79c792c704a593f6c93.zip
add interactive_pkgs stuff
Diffstat (limited to 'perl-install/network/ethernet.pm')
-rw-r--r--perl-install/network/ethernet.pm12
1 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index 0c5a70b19..adf3388bd 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -8,7 +8,7 @@ use common;
use run_program;
use network::tools;
use vars qw(@ISA @EXPORT);
-use MDK::Common::Globals "network", qw($in $prefix $install);
+use MDK::Common::Globals "network", qw($in $prefix);
@ISA = qw(Exporter);
@EXPORT = qw(configureNetwork conf_network_card conf_network_card_backend go_ethernet);
@@ -38,12 +38,12 @@ sub configure_cable {
Default is dhcpcd"),
sub { $_[0]{description} },
\@m )) {
- $f->{c}==1 and $netcnx->{dhcp_client}="dhcpcd" and $install->(qw(dhcpcd));
- $f->{c}==3 and $netcnx->{dhcp_client}="dhcpxd" and $install->(qw(dhcpxd));
- $f->{c}==4 and $netcnx->{dhcp_client}="dhcp-client" and $install->(qw(dhcp-client));
+ $f->{c}==1 and $netcnx->{dhcp_client}="dhcpcd" and $in->do_pkgs->install(qw(dhcpcd));
+ $f->{c}==3 and $netcnx->{dhcp_client}="dhcpxd" and $in->do_pkgs->install(qw(dhcpxd));
+ $f->{c}==4 and $netcnx->{dhcp_client}="dhcp-client" and $in->do_pkgs->install(qw(dhcp-client));
}
} else {
- $install->(qw(dhcpcd));
+ $in->do_pkgs->install(qw(dhcpcd));
}
go_ethernet($netc, $intf, 'dhcp', '', '', $first_time);
write_cnx_script($netc, "cable",
@@ -62,7 +62,7 @@ sub configure_lan {
$::isInstall and $in->set_help('configureNetworkIP');
require Data::Dumper;
configureNetwork($netc, $intf, $first_time) or return;
- configureNetwork2($in, $prefix, $netc, $intf, $install);
+ configureNetwork2($in, $prefix, $netc, $intf);
if ($::isStandalone and ($::expert or $in->ask_yesorno(_("Network configuration"),
_("Do you want to restart the network"), 1))) {
run_program::rooted($prefix, "/etc/rc.d/init.d/network stop");