no_comment

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