diff options
author | Colin Guthrie <colin@mageia.org> | 2013-04-18 20:24:55 +0000 |
---|---|---|
committer | Colin Guthrie <colin@mageia.org> | 2013-04-18 20:24:55 +0000 |
commit | 85be01682a88405f5c6f9aa361eeb8271606e4f7 (patch) | |
tree | ac34966d63ddab8d9cb13c834e6143bdd69692ac /perl-install/scanner.pm | |
parent | 918f20f64f3800acf7152370211d30a176332db5 (diff) | |
download | drakx-85be01682a88405f5c6f9aa361eeb8271606e4f7.tar drakx-85be01682a88405f5c6f9aa361eeb8271606e4f7.tar.gz drakx-85be01682a88405f5c6f9aa361eeb8271606e4f7.tar.bz2 drakx-85be01682a88405f5c6f9aa361eeb8271606e4f7.tar.xz drakx-85be01682a88405f5c6f9aa361eeb8271606e4f7.zip |
Do not use /dev/inside prefix.
As /dev/ is bind mounted into the prefix, we should always refer to /dev/ directly.
In particular this is needed inside wild_device.pm which is often used before the
prefix is even ready (i.e. when configuring existing partitions).
A specific problem here was detecting the major/minor numbers of partitions
which failed because the device node was being searched for inside the prefix
but we'd not even unlocked the encrypted / partition yet to mount it... catch 22.
mga#5661
Diffstat (limited to 'perl-install/scanner.pm')
-rw-r--r-- | perl-install/scanner.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/scanner.pm b/perl-install/scanner.pm index 12958dd20..0b3bc6702 100644 --- a/perl-install/scanner.pm +++ b/perl-install/scanner.pm @@ -35,7 +35,7 @@ our $scannerDB = readScannerDB("$scannerDBdir/ScannerDB"); sub confScanner { my ($model, $port, $vendor, $product, $firmware) = @_; - $port ||= "$::prefix/dev/scanner"; + $port ||= "/dev/scanner"; my $a = $scannerDB->{$model}{server}; #print "file:[$a]\t[$model]\t[$port]\n| ", (join "\n| ", @{$scannerDB->{$model}{lines}}),"\n"; my @driverconf = cat_("$sanedir/$a.conf"); |