summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-05-08 17:07:19 +0000
committerFrancois Pons <fpons@mandriva.com>2000-05-08 17:07:19 +0000
commit5e3a791f365d7b666f469d4c51fa857ebafec23a (patch)
tree094d1ef481ff0b06655aab5bfa1aa8c9fce0072e
parent6c87ce4b1de549e1f781dd4ec6eff96b798532ef (diff)
downloaddrakx-backup-do-not-use-5e3a791f365d7b666f469d4c51fa857ebafec23a.tar
drakx-backup-do-not-use-5e3a791f365d7b666f469d4c51fa857ebafec23a.tar.gz
drakx-backup-do-not-use-5e3a791f365d7b666f469d4c51fa857ebafec23a.tar.bz2
drakx-backup-do-not-use-5e3a791f365d7b666f469d4c51fa857ebafec23a.tar.xz
drakx-backup-do-not-use-5e3a791f365d7b666f469d4c51fa857ebafec23a.zip
*** empty log message ***
-rw-r--r--perl-install/detect_devices.pm6
-rw-r--r--perl-install/modules.pm14
-rw-r--r--perl-install/mouse.pm2
3 files changed, 12 insertions, 10 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 8367c0bdd..de03702a9 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -256,8 +256,10 @@ sub probeUSB {
if ($@) {
$usb_interface = '';
} else {
- modules::load("usbkbd");
- modules::load("keybdev");
+ eval {
+ modules::load("usbkbd");
+ modules::load("keybdev");
+ };
}
} else {
$usb_interface = '';
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 198bc118f..3a3ea2811 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -160,14 +160,14 @@ arch() =~ /^sparc/ ? (
[ 'cdrom', {
arch() !~ /^sparc/ ? (
"sbpcd" => "SoundBlaster/Panasonic",
-#- "aztcd" => "Aztech CD",
-#- "gscd" => "Goldstar R420",
-#- "isp16" => "ISP16/MAD16/Mozart",
+ "aztcd" => "Aztech CD",
+ "gscd" => "Goldstar R420",
+#- "isp16" => "ISP16/MAD16/Mozart", #- removed for space
#- "mcd" => "Mitsumi", #- removed for space
-#- "mcdx" => "Mitsumi (alternate)",
-#- "optcd" => "Optics Storage 8000",
-#- "cm206" => "Phillips CM206/CM260",
-#- "sjcd" => "Sanyo",
+#- "mcdx" => "Mitsumi (alternate)", #- removed for space
+ "optcd" => "Optics Storage 8000",
+ "cm206" => "Phillips CM206/CM260",
+ "sjcd" => "Sanyo",
"cdu31a" => "Sony CDU-31A",
"sonycd535" => "Sony CDU-5xx",
) : (),
diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm
index 8f8607990..f939e3fe0 100644
--- a/perl-install/mouse.pm
+++ b/perl-install/mouse.pm
@@ -144,7 +144,7 @@ sub detect() {
modules::load("usbmouse");
modules::load("mousedev");
};
- sleep(1);
+ sleep(2);
if (!$@ && detect_devices::tryOpen("usbmouse")) {
$wacom or modules::unload("serial");
return name2mouse("USB Mouse"), $wacom;