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 | 1b9eb330e566776841dfc1c38fe00d7a05bfb18e (patch) | |
| tree | 55938d10ac022099f8afae99bb966f7c736fa167 /perl-install | |
| parent | 4ca11edf972ac771bf949a7c28c22f771ac96d37 (diff) | |
| download | drakx-backup-do-not-use-1b9eb330e566776841dfc1c38fe00d7a05bfb18e.tar drakx-backup-do-not-use-1b9eb330e566776841dfc1c38fe00d7a05bfb18e.tar.gz drakx-backup-do-not-use-1b9eb330e566776841dfc1c38fe00d7a05bfb18e.tar.bz2 drakx-backup-do-not-use-1b9eb330e566776841dfc1c38fe00d7a05bfb18e.tar.xz drakx-backup-do-not-use-1b9eb330e566776841dfc1c38fe00d7a05bfb18e.zip | |
(getSerialModem) revert complexify
Diffstat (limited to 'perl-install')
| -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; |