summaryrefslogtreecommitdiffstats
path: root/perl-install/scanner.pm
diff options
context:
space:
mode:
authorTiago Salem Herrmann <salem@mandriva.com.br>2008-03-11 20:12:51 +0000
committerTiago Salem Herrmann <salem@mandriva.com.br>2008-03-11 20:12:51 +0000
commit7fc3efcf1cc09fe28ab4f728a9b12dd52d9010a4 (patch)
treea181cdaefad3e0c42d4fbaeb4574ad12f90ee8fe /perl-install/scanner.pm
parent5d05527de82c6c954365fa87f94591e4733253df (diff)
downloaddrakx-7fc3efcf1cc09fe28ab4f728a9b12dd52d9010a4.tar
drakx-7fc3efcf1cc09fe28ab4f728a9b12dd52d9010a4.tar.gz
drakx-7fc3efcf1cc09fe28ab4f728a9b12dd52d9010a4.tar.bz2
drakx-7fc3efcf1cc09fe28ab4f728a9b12dd52d9010a4.tar.xz
drakx-7fc3efcf1cc09fe28ab4f728a9b12dd52d9010a4.zip
- fixing crash when installing parallel scanner (#36387, #37039)
Diffstat (limited to 'perl-install/scanner.pm')
-rw-r--r--perl-install/scanner.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/scanner.pm b/perl-install/scanner.pm
index dd42cbb7e..239520c01 100644
--- a/perl-install/scanner.pm
+++ b/perl-install/scanner.pm
@@ -123,7 +123,8 @@ sub installfirmware {
return $firmware;
}
-sub configured() {
+sub configured {
+ my ($in) = @_;
my @res;
my $parportscannerfound = 0;
# Run "scanimage -L", to find the scanners which are already working
@@ -160,7 +161,7 @@ sub configured() {
}
close LIST;
# We have a parallel port scanner, make it working for non-root users
- nonroot_access_for_parport($parportscannerfound);
+ nonroot_access_for_parport($parportscannerfound, $in);
return @res;
}
@@ -175,7 +176,7 @@ sub nonroot_access_for_parport {
# http://www.linuxprinting.org/download/digitalimage/Scanning-as-Normal-User-on-Wierd-Scanner-Mini-HOWTO.txt
# Desired state of this facility: 1: Enable, 0: Disable
- my ($enable) = @_;
+ my ($enable, $in) = @_;
# Is saned running?
my $sanedrunning = services::starts_on_boot("saned");
# Is the "net" SANE backend active