summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-10-09 13:56:10 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-10-09 13:56:10 +0000
commita3a015c348486f1f91dbf150a0925887157d6dd1 (patch)
tree5b5ef8d358bfa24a4ab84a462a7707021d5e10dd /perl-install/install2.pm
parentcce82543244847bc44ccdd9d116e2fd04599f14c (diff)
downloaddrakx-a3a015c348486f1f91dbf150a0925887157d6dd1.tar
drakx-a3a015c348486f1f91dbf150a0925887157d6dd1.tar.gz
drakx-a3a015c348486f1f91dbf150a0925887157d6dd1.tar.bz2
drakx-a3a015c348486f1f91dbf150a0925887157d6dd1.tar.xz
drakx-a3a015c348486f1f91dbf150a0925887157d6dd1.zip
ensure floppies() takes care of usb-storage if possible, so that patch on usb floppy works
Diffstat (limited to 'perl-install/install2.pm')
-rw-r--r--perl-install/install2.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index a2d52ea20..165d69b5a 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -448,6 +448,8 @@ sub main {
}
require"install_steps_$o->{interactive}.pm" if $o->{interactive}; #- no space to skip perl2fcalls
+ # needed before accessing floppy (in case of usb floppy)
+ $::noauto or modules::load_thiskind("usb");
eval { $o = $::o = install_any::loadO($o, "patch") } if $patch;
eval { $o = $::o = install_any::loadO($o, $cfg) } if $cfg;
@@ -459,7 +461,6 @@ sub main {
} modules::get_that_type('sound');
#- needed very early for install_steps_gtk
- $::noauto or modules::load_thiskind("usb");
eval { ($o->{mouse}, @{$o->{wacom} = []}) = mouse::detect() } unless $o->{nomouseprobe} || $o->{mouse};
$o->{lang} = lang::set($o->{lang}); #- mainly for defcfg