diff options
author | Damien Chaumette <dchaumette@mandriva.com> | 2002-10-18 13:02:06 +0000 |
---|---|---|
committer | Damien Chaumette <dchaumette@mandriva.com> | 2002-10-18 13:02:06 +0000 |
commit | 8d085834abd60e8ca890750352871c7f4151a735 (patch) | |
tree | 9c412834d4b84d11c202d54055b7bdfb115f0954 | |
parent | acdc26142db3112becc42fe2e5c67147ed8a9fa7 (diff) | |
download | drakx-backup-do-not-use-8d085834abd60e8ca890750352871c7f4151a735.tar drakx-backup-do-not-use-8d085834abd60e8ca890750352871c7f4151a735.tar.gz drakx-backup-do-not-use-8d085834abd60e8ca890750352871c7f4151a735.tar.bz2 drakx-backup-do-not-use-8d085834abd60e8ca890750352871c7f4151a735.tar.xz drakx-backup-do-not-use-8d085834abd60e8ca890750352871c7f4151a735.zip |
change dumb return values s/@pci_modems, $serial_modem/$serial_modem, @pci_modems/ (thanks to pixel)
-rw-r--r-- | perl-install/detect_devices.pm | 11 | ||||
-rw-r--r-- | perl-install/network/netconnect.pm | 2 |
2 files changed, 2 insertions, 11 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 812027e16..f7adeeb5d 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -370,15 +370,6 @@ sub getCPUs { @cpus; } -#-AT&F&O2B40 -#- DialString=ATDT0231389595(( - -#- modem_detect_backend : detects modem on serial ports and fills the infos in $modem : detects only one card -#- input -#- $modem -#- $mouse : facultative, hash containing device to exclude not to test mouse port : ( device => /ttyS[0-9]/ ) -#- output: -#- $modem->{device} : device where the modem were detected sub getSerialModem { my ($modem, $mouse) = @_; $mouse ||= {}; @@ -405,7 +396,7 @@ sub getModem() { my @pci_modems = grep { $_->{driver} eq 'Bad:www.linmodems.org' } probeall(0); my $serial_modem = {}; getSerialModem($serial_modem); - @pci_modems, $serial_modem; + $serial_modem, @pci_modems; } sub getSpeedtouch { diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 35ba42fc3..8277672ce 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -78,7 +78,7 @@ sub detect { my $modem = {}; require network::modem; network::modem->import; - my (@pci_modems, $modem) = detect_devices::getModem; pop @pci_modems; + my ($modem, @pci_modems) = detect_devices::getModem; pop @pci_modems; $modem->{device} and $auto_detect->{modem} = $modem->{device}; show_pci_modems(@pci_modems) if @pci_modems; } |