|
 |
b04b61c |
From 1567fcb9d9dd3dea6e0978ef2473ac7dba7dbba0 Mon Sep 17 00:00:00 2001
|
|
|
b04b61c |
From: Nils Philippsen <nils@redhat.com>
|
|
|
b04b61c |
Date: Wed, 20 Nov 2013 22:04:21 +0100
|
|
|
b04b61c |
Subject: [PATCH] patch: scsi-permissions
|
|
|
b04b61c |
|
|
|
b04b61c |
Squashed commit of the following:
|
|
|
b04b61c |
|
|
|
b04b61c |
commit 80e8a34505a45dd61761ce557bf029e33e39d2f2
|
|
|
b04b61c |
Author: Nils Philippsen <nils@redhat.com>
|
|
|
b04b61c |
Date: Wed Nov 20 21:45:23 2013 +0100
|
|
|
b04b61c |
|
|
|
b04b61c |
sane-desc: fix faulty udev logic for SCSI devices
|
|
|
b04b61c |
|
|
|
b04b61c |
SUBSYSTEMS!="..." seems to always match, i.e. skip the SCSI-specific
|
|
|
b04b61c |
rules.
|
|
|
b04b61c |
|
|
|
b04b61c |
(cherry picked from commit 758731489d0d58bab6e4b70db9556038c9f4bb67)
|
|
|
b04b61c |
---
|
|
|
b04b61c |
tools/sane-desc.c | 7 +++++--
|
|
|
b04b61c |
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
b04b61c |
|
|
|
b04b61c |
diff --git a/tools/sane-desc.c b/tools/sane-desc.c
|
|
|
b04b61c |
index ae218c3..72e11b8 100644
|
|
|
b04b61c |
--- a/tools/sane-desc.c
|
|
|
b04b61c |
+++ b/tools/sane-desc.c
|
|
|
b04b61c |
@@ -3569,7 +3569,8 @@ print_udev (void)
|
|
|
b04b61c |
|
|
|
b04b61c |
printf ("\nLABEL=\"libsane_usb_rules_end\"\n\n");
|
|
|
b04b61c |
|
|
|
b04b61c |
- printf ("SUBSYSTEMS!=\"scsi\", GOTO=\"libsane_scsi_rules_end\"\n\n");
|
|
|
b04b61c |
+ printf ("SUBSYSTEMS==\"scsi\", GOTO=\"libsane_scsi_rules_begin\"\n");
|
|
|
b04b61c |
+ printf ("GOTO=\"libsane_scsi_rules_end\"\n\n");
|
|
|
b04b61c |
printf ("LABEL=\"libsane_scsi_rules_begin\"\n");
|
|
|
b04b61c |
printf ("# Generic: SCSI device type 6 indicates a scanner\n");
|
|
|
b04b61c |
|
|
|
b04b61c |
@@ -3695,7 +3696,9 @@ print_udevhwdb (void)
|
|
|
b04b61c |
printf("ENV{DEVTYPE}==\"usb_device\", ENV{libsane_matched}==\"yes\", TEST==\"power/control\", ATTR{power/control}=\"on\"\n\n");
|
|
|
b04b61c |
printf("ENV{DEVTYPE}==\"usb_device\", ENV{libsane_matched}==\"yes\", TEST!=\"power/control\", TEST==\"power/level\", ATTR{power/level}=\"on\"\n");
|
|
|
b04b61c |
|
|
|
b04b61c |
- printf ("SUBSYSTEMS!=\"scsi\", GOTO=\"libsane_rules_end\"\n");
|
|
|
b04b61c |
+ printf ("SUBSYSTEMS==\"scsi\", GOTO=\"libsane_scsi_rules_begin\"\n");
|
|
|
b04b61c |
+ printf ("GOTO=\"libsane_rules_end\"\n\n");
|
|
|
b04b61c |
+ printf ("LABEL=\"libsane_scsi_rules_begin\"\n");
|
|
|
b04b61c |
printf ("KERNEL!=\"sg[0-9]*\", GOTO=\"libsane_rules_end\"\n\n");
|
|
|
b04b61c |
|
|
|
b04b61c |
printf ("# Generic: SCSI device type 6 indicates a scanner\n");
|
|
|
b04b61c |
--
|
|
|
b04b61c |
1.8.4.2
|
|
|
b04b61c |
|