diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-03-24 14:29:56 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-03-24 14:29:56 +0000 |
| commit | f74c3b0afadaa40c9a784321029959a7fffdd0e6 (patch) | |
| tree | 32777c65d09619bfde64fd85ce6f4ab161bddb23 /perl-install/install2.pm | |
| parent | ed76955e239d467e996ea3d20e8ae14c13db0253 (diff) | |
| download | drakx-backup-do-not-use-f74c3b0afadaa40c9a784321029959a7fffdd0e6.tar drakx-backup-do-not-use-f74c3b0afadaa40c9a784321029959a7fffdd0e6.tar.gz drakx-backup-do-not-use-f74c3b0afadaa40c9a784321029959a7fffdd0e6.tar.bz2 drakx-backup-do-not-use-f74c3b0afadaa40c9a784321029959a7fffdd0e6.tar.xz drakx-backup-do-not-use-f74c3b0afadaa40c9a784321029959a7fffdd0e6.zip | |
no_comment
Diffstat (limited to 'perl-install/install2.pm')
| -rw-r--r-- | perl-install/install2.pm | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 07095f8b7..8fa163367 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -234,6 +234,14 @@ sub selectMouse { } #------------------------------------------------------------------------------ +sub setupSCSI { + my ($clicked) = $_[0]; + $o->{autoSCSI} ||= $::beginner; + + $o->setupSCSI($o->{autoSCSI} && !$clicked, $clicked); +} + +#------------------------------------------------------------------------------ sub selectKeyboard { my ($clicked) = $_[0]; @@ -269,14 +277,6 @@ sub selectInstallClass { } #------------------------------------------------------------------------------ -sub setupSCSI { - my ($clicked) = $_[0]; - $o->{autoSCSI} ||= $::beginner; - - $o->setupSCSI($o->{autoSCSI} && !$clicked, $clicked); -} - -#------------------------------------------------------------------------------ sub partitionDisks { return $o->{fstab} = [ @@ -572,7 +572,8 @@ sub main { if ($::auto_install) { require install_steps_auto_install; - eval { $o = $::o = install_any::loadO($o, "floppy") }; + eval { $o = $::o = install_any::loadO($o, "Mandrake/auto_inst.cfg.pl") }; + eval { $o = $::o = install_any::loadO($o, "floppy") } if $@; if ($@) { log::l("error using auto_install, continuing"); undef $::auto_install; @@ -628,7 +629,7 @@ sub main { modules::read_stage1_conf("/tmp/conf.modules"); modules::read_already_loaded(); - modules::load_multi(qw(ide-probe ide-disk ide-cd sd_mod af_packet)); + modules::load("af_packet"); install_any::lnx4win_preinstall() if $o->{lnx4win}; #-the main cycle |