summaryrefslogtreecommitdiffstats
path: root/perl-install/detect_devices.pm
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2011-12-19 16:39:53 +0000
committerThierry Vignaud <tv@mageia.org>2011-12-19 16:39:53 +0000
commit4aaa4d351c3acefbc9c08f899eb135758ef7ba41 (patch)
tree4203a3cde58a0add6b5f1484fd022741f0ac39f2 /perl-install/detect_devices.pm
parent60b28dca44fbeaaf010e2f94fc2c39a4c73ff4aa (diff)
downloaddrakx-4aaa4d351c3acefbc9c08f899eb135758ef7ba41.tar
drakx-4aaa4d351c3acefbc9c08f899eb135758ef7ba41.tar.gz
drakx-4aaa4d351c3acefbc9c08f899eb135758ef7ba41.tar.bz2
drakx-4aaa4d351c3acefbc9c08f899eb135758ef7ba41.tar.xz
drakx-4aaa4d351c3acefbc9c08f899eb135758ef7ba41.zip
kill dead comments & code (support for kernel-2.[24].x, devfs is dead since 2.5.x kernels, ...)
Diffstat (limited to 'perl-install/detect_devices.pm')
-rw-r--r--perl-install/detect_devices.pm6
1 files changed, 2 insertions, 4 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index b9eaa932a..2d3c2fd5c 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -342,9 +342,7 @@ sub getCompaqSmartArray() {
my (@idi, $f);
foreach ('array/ida', 'cpqarray/ida', 'cciss/cciss') {
- my $prefix = "/proc/driver/$_"; #- kernel 2.4 places it here
- $prefix = "/proc/$_" if !-e "${prefix}0"; #- kernel 2.2
-
+ my $prefix = "/proc/driver/$_";
my ($name) = m|/(.*)|;
for (my $i = 0; -r ($f = "${prefix}$i"); $i++) {
my @raw_devices = cat_($f) =~ m|^\s*($name/.*?):|gm;
@@ -1066,7 +1064,7 @@ sub hasSMP() {
(any { /^processor\s*:\s*(\d+)/ && $1 > 0 } cat_('/proc/cpuinfo')) ||
any { /\bProcessor #(\d+)\s+(\S*)/ && $1 > 0 && $2 ne 'invalid' } syslog();
}
-sub hasPCMCIA() { $::o->{pcmcia} } #- because /proc/pcmcia seems not to be present on 2.4 at least (or use /var/run/stab)
+sub hasPCMCIA() { $::o->{pcmcia} }
my (@dmis, $dmidecode_already_runned);