diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-08-08 18:26:31 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-08-08 18:26:31 +0000 |
| commit | 157fe13a76e798fa8af5f79c792c704a593f6c93 (patch) | |
| tree | 7dded9e6761033f09709722965d15b14ce7825bd /perl-install/network/netconnect.pm | |
| parent | b4fd82d0ced6a2118a51b060d2eff8c4f179b52b (diff) | |
| download | drakx-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/netconnect.pm')
| -rw-r--r-- | perl-install/network/netconnect.pm | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index b9ac8f677..e5dff7d89 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -17,12 +17,12 @@ use commands; #require Data::Dumper; use network::tools; -use MDK::Common::Globals "network", qw($in $prefix $install $connect_file $disconnect_file $connect_prog); +use MDK::Common::Globals "network", qw($in $prefix $connect_file $disconnect_file $connect_prog); #- intro is called only in standalone. sub intro { - my ($prefix, $netcnx, $in, $install) = @_; + my ($prefix, $netcnx, $in) = @_; my ($netc, $mouse, $intf) = ({}, {}, {}); my $text; my $connected; @@ -52,9 +52,9 @@ sub intro { \@l ); run_program::rooted($prefix, $connect_prog) if ($e->{c}==1); run_program::rooted($prefix, $disconnect_file) if ($e->{c}==2); - main($prefix, $netcnx, $netc, $mouse, $in, $intf, $install, 0, 0) if ($e->{c}==3); + main($prefix, $netcnx, $netc, $mouse, $in, $intf, 0, 0) if ($e->{c}==3); } else { - main($prefix, $netcnx, $netc, $mouse, $in, $intf, $install, 0, 0); + main($prefix, $netcnx, $netc, $mouse, $in, $intf, 0, 0); } } @@ -110,11 +110,10 @@ sub pre_func { } sub main { - my ($prefix, $netcnx, $netc, $mouse, $in, $intf, $install, $first_time, $direct_fr) = @_; + my ($prefix, $netcnx, $netc, $mouse, $in, $intf, $first_time, $direct_fr) = @_; MDK::Common::Globals::init( in => $in, prefix => $prefix, - install => $install, connect_file => "/etc/sysconfig/network-scripts/net_cnx_up", disconnect_file => "/etc/sysconfig/network-scripts/net_cnx_down", connect_prog => "/etc/sysconfig/network-scripts/net_cnx_pg" ); @@ -236,7 +235,7 @@ environnement to avoid hostname changing problem.")); step_5: - network::configureNetwork2($in, $prefix, $netc, $intf, $install); + network::configureNetwork2($in, $prefix, $netc, $intf); if ($netcnx->{type} =~ /modem/ || $netcnx->{type} =~ /isdn_external/) { output "$prefix$connect_prog", |