39 lines
1.6 KiB
Diff
39 lines
1.6 KiB
Diff
|
commit 5e153e8354ee1cba5d7cd4a532f671810186a6a1
|
||
|
|
Author: Nils Philippsen <nils@redhat.com>
|
||
|
|
Date: Thu Oct 22 11:19:22 2009 +0200
|
||
|
|
|
||
|
|
patch: udev
|
||
|
|
|
||
|
|
Squashed commit of the following:
|
||
|
|
|
||
|
|
commit fe874d6f9873598e8bcd9201508bc2c89365e821
|
||
|
|
Author: Nils Philippsen <nils@redhat.com>
|
||
|
|
Date: Thu Oct 22 11:16:16 2009 +0200
|
||
|
|
|
||
|
|
adapt generated udev rules for Fedora
|
||
|
|
|
||
|
|
diff --git a/tools/sane-desc.c b/tools/sane-desc.c
|
||
|
|
index c317700..b6638a4 100644
|
||
|
|
--- a/tools/sane-desc.c
|
||
|
|
+++ b/tools/sane-desc.c
|
||
|
|
@@ -3488,7 +3488,7 @@ print_udev (void)
|
||
|
|
printf ("SUBSYSTEMS!=\"scsi\", GOTO=\"libsane_scsi_rules_end\"\n\n");
|
||
|
|
printf ("LABEL=\"libsane_scsi_rules_begin\"\n");
|
||
|
|
printf ("# Generic: SCSI device type 6 indicates a scanner\n");
|
||
|
|
- printf ("KERNEL==\"sg[0-9]*\", NAME=\"%%k\", ATTRS{type}==\"6\", MODE=\"%s\", GROUP=\"%s\"\n", DEVMODE, DEVGROUP);
|
||
|
|
+ printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"6\", ENV{libsane_matched}=\"yes\"\n");
|
||
|
|
printf ("# Some scanners advertise themselves as SCSI device type 3\n");
|
||
|
|
|
||
|
|
while (scsiid)
|
||
|
|
@@ -3521,8 +3521,8 @@ print_udev (void)
|
||
|
|
}
|
||
|
|
}
|
||
|
|
printf ("\n");
|
||
|
|
- printf ("KERNEL==\"sg[0-9]*\", NAME=\"%%k\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", MODE=\"%s\", GROUP=\"%s\"\n",
|
||
|
|
- scsiid->scsi_vendor_id, scsiid->scsi_product_id, DEVMODE, DEVGROUP);
|
||
|
|
+ printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", ENV{libsane_matched}=\"yes\"\n",
|
||
|
|
+ scsiid->scsi_vendor_id, scsiid->scsi_product_id);
|
||
|
|
scsiid = scsiid->next;
|
||
|
|
}
|
||
|
|
printf ("LABEL=\"libsane_scsi_rules_end\"\n\n");
|