]>
Commit | Line | Data |
---|---|---|
11eadc86 SS |
1 | From ba900ddc747cb89c2600c60a1391862e918541d2 Mon Sep 17 00:00:00 2001 |
2 | From: Nils Philippsen <nils@redhat.com> | |
3 | Date: Wed, 5 May 2010 11:49:10 +0200 | |
4 | Subject: [PATCH] patch: udev | |
5 | ||
6 | Squashed commit of the following: | |
7 | ||
8 | commit eecfce287372abf2b336f0d6870611445170645b | |
9 | Author: Nils Philippsen <nils@redhat.com> | |
10 | Date: Wed May 5 11:14:59 2010 +0200 | |
11 | ||
12 | adapt generated udev rules for Fedora | |
13 | --- | |
14 | tools/sane-desc.c | 14 +++++++------- | |
15 | 1 files changed, 7 insertions(+), 7 deletions(-) | |
16 | ||
17 | diff --git a/tools/sane-desc.c b/tools/sane-desc.c | |
18 | index 658555e..0b24e3b 100644 | |
19 | --- a/tools/sane-desc.c | |
20 | +++ b/tools/sane-desc.c | |
21 | @@ -56,9 +56,9 @@ | |
22 | #define COLOR_NEW "\"#F00000\"" | |
23 | #define COLOR_UNKNOWN "\"#000000\"" | |
24 | ||
25 | -#define DEVMODE "0664" | |
26 | +#define DEVMODE "0644" | |
27 | #define DEVOWNER "root" | |
28 | -#define DEVGROUP "scanner" | |
29 | +#define DEVGROUP "root" | |
30 | ||
31 | #ifndef PATH_MAX | |
32 | # define PATH_MAX 1024 | |
33 | @@ -3525,8 +3525,8 @@ print_udev (void) | |
34 | } | |
35 | } | |
36 | printf ("\n"); | |
37 | - printf ("ATTRS{idVendor}==\"%s\", ATTRS{idProduct}==\"%s\", MODE=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n", | |
38 | - usbid->usb_vendor_id + 2, usbid->usb_product_id + 2, DEVMODE, DEVGROUP); | |
39 | + printf ("ATTRS{idVendor}==\"%s\", ATTRS{idProduct}==\"%s\", ENV{libsane_matched}=\"yes\"\n", | |
40 | + usbid->usb_vendor_id + 2, usbid->usb_product_id + 2); | |
41 | usbid = usbid->next; | |
42 | } | |
43 | ||
44 | @@ -3538,7 +3538,7 @@ print_udev (void) | |
45 | printf ("SUBSYSTEMS!=\"scsi\", GOTO=\"libsane_scsi_rules_end\"\n\n"); | |
46 | printf ("LABEL=\"libsane_scsi_rules_begin\"\n"); | |
47 | printf ("# Generic: SCSI device type 6 indicates a scanner\n"); | |
48 | - printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"6\", MODE=\"%s\", GROUP=\"%s\"\n", DEVMODE, DEVGROUP); | |
49 | + printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"6\", ENV{libsane_matched}=\"yes\"\n"); | |
50 | printf ("# Some scanners advertise themselves as SCSI device type 3\n"); | |
51 | ||
52 | while (scsiid) | |
53 | @@ -3571,8 +3571,8 @@ print_udev (void) | |
54 | } | |
55 | } | |
56 | printf ("\n"); | |
57 | - printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", MODE=\"%s\", GROUP=\"%s\"\n", | |
58 | - scsiid->scsi_vendor_id, scsiid->scsi_product_id, DEVMODE, DEVGROUP); | |
59 | + printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", ENV{libsane_matched}=\"yes\"\n", | |
60 | + scsiid->scsi_vendor_id, scsiid->scsi_product_id); | |
61 | scsiid = scsiid->next; | |
62 | } | |
63 | printf ("LABEL=\"libsane_scsi_rules_end\"\n\n"); | |
64 | -- | |
65 | 1.6.6.1 | |
66 |