summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-09-13 13:30:37 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-09-13 13:30:37 +0000
commit5ad0ed55d7a51db8301f44ed2bafdd48c0682e4c (patch)
treebd51eab841234881b3a8923aa21f63909dc0bb00 /perl-install/install_steps_interactive.pm
parentb95c12f4cff7dc36b247391348d2781e70fad29c (diff)
downloaddrakx-5ad0ed55d7a51db8301f44ed2bafdd48c0682e4c.tar
drakx-5ad0ed55d7a51db8301f44ed2bafdd48c0682e4c.tar.gz
drakx-5ad0ed55d7a51db8301f44ed2bafdd48c0682e4c.tar.bz2
drakx-5ad0ed55d7a51db8301f44ed2bafdd48c0682e4c.tar.xz
drakx-5ad0ed55d7a51db8301f44ed2bafdd48c0682e4c.zip
no_comment
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm10
1 files changed, 3 insertions, 7 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 7954d31cf..04a5ac94a 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -17,17 +17,13 @@ use install_steps;
use install_interactive;
use install_any;
use detect_devices;
-use netconnect;
use run_program;
-use commands;
use devices;
use fsedit;
-use network;
-use raid;
+use loopback;
use mouse;
use modules;
use lang;
-use loopback;
use keyboard;
use any;
use fs;
@@ -470,6 +466,7 @@ sub afterInstallPackages($) {
#------------------------------------------------------------------------------
sub configureNetwork {
my ($o, $first_time) = @_;
+ require netconnect;
netconnect::main($o->{prefix}, $o->{netcnx} ||= {}, $o->{netc}, $o->{mouse}, $o, $o->{pcmcia}, $o->{intf}, $first_time);
}
@@ -872,16 +869,15 @@ sub configureX {
#------------------------------------------------------------------------------
sub generateAutoInstFloppy($) {
my ($o) = @_;
-
$::expert || $::g_auto_install or return;
my ($floppy) = detect_devices::floppies();
-
$o->ask_yesorno('',
_("Do you want to generate an auto install floppy for linux replication?"), $floppy) or return;
$o->ask_warn('', _("Insert a blank floppy in drive %s", $floppy));
+ require commands;
my $dev = devices::make($floppy);
my $image = $o->{pcmcia} ? "pcmcia" :