diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-03-19 18:56:50 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-03-19 18:56:50 +0000 |
| commit | 21627cd7dc9b89ed7ad4b95c4819e9ce3a9aef90 (patch) | |
| tree | 55938d10ac022099f8afae99bb966f7c736fa167 | |
| parent | 394b359511600068f016a150d6758886c4af76b0 (diff) | |
| download | drakx-21627cd7dc9b89ed7ad4b95c4819e9ce3a9aef90.tar drakx-21627cd7dc9b89ed7ad4b95c4819e9ce3a9aef90.tar.gz drakx-21627cd7dc9b89ed7ad4b95c4819e9ce3a9aef90.tar.bz2 drakx-21627cd7dc9b89ed7ad4b95c4819e9ce3a9aef90.tar.xz drakx-21627cd7dc9b89ed7ad4b95c4819e9ce3a9aef90.zip | |
(getSerialModem) revert complexify
| -rw-r--r-- | perl-install/detect_devices.pm | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 87166638e..da48ba9f9 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -585,14 +585,8 @@ sub getSerialModem { my ($modules_conf, $o_mouse) = @_; my $mouse = $o_mouse || {}; $mouse->{device} = readlink "/dev/mouse"; - my $serdev; - if (arch() =~ /ppc/) { - $serdev = "macserial"; - } elsif (arch() =~ /mips/) { - $serdev = "8250"; - } else { - $serdev = "serial"; - } + my $serdev = arch() =~ /ppc/ ? "macserial" : arch() =~ /mips/ ? "8250" : "serial"; + eval { modules::load($serdev) }; my @modems; |