summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2005-02-10 10:58:44 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2005-02-10 10:58:44 +0000
commitb31a3aa7fae4b45dac9d7557e3e296df1b8c71cd (patch)
tree5d7cd14758f69ba15d5dba5694c58b5f16765a74
parent1fcce06d8f3f8cfe8c59563dd64d92fc5d71cc85 (diff)
downloaddrakx-backup-do-not-use-b31a3aa7fae4b45dac9d7557e3e296df1b8c71cd.tar
drakx-backup-do-not-use-b31a3aa7fae4b45dac9d7557e3e296df1b8c71cd.tar.gz
drakx-backup-do-not-use-b31a3aa7fae4b45dac9d7557e3e296df1b8c71cd.tar.bz2
drakx-backup-do-not-use-b31a3aa7fae4b45dac9d7557e3e296df1b8c71cd.tar.xz
drakx-backup-do-not-use-b31a3aa7fae4b45dac9d7557e3e296df1b8c71cd.zip
add various/serial category and thus add support for mice and modems
connected to multiport serial cards
-rw-r--r--kernel/list_modules.pm5
-rw-r--r--perl-install/detect_devices.pm4
2 files changed, 8 insertions, 1 deletions
diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm
index 113953663..a92f810f4 100644
--- a/kernel/list_modules.pm
+++ b/kernel/list_modules.pm
@@ -196,11 +196,14 @@ our %l = (
char => [
if_(arch() =~ /ia64/, qw(efivars)),
qw(hw_random applicom n_r3964 nvram pc110pad ppdev),
- qw(mxser moxa isicom wdt_pci epca synclink istallion i810-tco sx), #- what are these???
+ qw(wdt_pci i810-tco sx), #- what are these???
],
laptop => [
qw(i8k sonypi toshiba),
],
+ serial => [
+ qw(8250_pci 8250 epca esp isicom istallion moxa mxser stallion sx synclink synclinkmp),
+ ],
other => [
qw(defxx i810fb ide-floppy ide-scsi ide-tape loop lp nbd sg st),
qw(parport_pc parport_serial),
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 931f7dfc3..555a141e1 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -871,6 +871,10 @@ sub usbKeyboard2country_code {
}
sub probeSerialDevices() {
+ require list_modules;
+ require modules;
+ modules::load_category($::o->{modules_conf}, 'various/serial');
+ modules::append_to_modules_loaded_at_startup_for_all_kernels() foreach list_modules::category2modules('various/serial');
foreach (0..3) {
#- make sure the device are created before probing,
devices::make("/dev/ttyS$_");