mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'fix-udev-rules' into 'master' 

Trigger udev rules parsing on all kernel events except of "remove".

See merge request sane-project/backends!541
merge-requests/576/merge
Olaf Meeuwissen 2021-01-24 08:24:47 +00:00
rodzic 420e09214a 1042a61c30
commit 63d938de61
4 zmienionych plików z 5 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
testsuite/tools/data/udev+acl.ref
Wyświetl plik

@ -23,7 +23,7 @@
# If the scanner is supported by sane-backends, please mail the entry to
# the sane-devel mailing list (sane-devel@alioth-lists.debian.net).
#
ACTION!="add", GOTO="libsane_rules_end"
ACTION=="remove", GOTO="libsane_rules_end"
ENV{DEVTYPE}=="usb_device", GOTO="libsane_create_usb_dev"
SUBSYSTEMS=="scsi", GOTO="libsane_scsi_rules_begin"
SUBSYSTEM=="usb_device", GOTO="libsane_usb_rules_begin"

2
testsuite/tools/data/udev+hwdb.ref
Wyświetl plik

@ -20,7 +20,7 @@
# If the scanner is supported by sane-backends, please mail the entry to
# the sane-devel mailing list (sane-devel@alioth-lists.debian.net).
#
ACTION!="add", GOTO="libsane_rules_end"
ACTION=="remove", GOTO="libsane_rules_end"
# The following rule will disable USB autosuspend for the device
ENV{DEVTYPE}=="usb_device", ENV{libsane_matched}=="yes", TEST=="power/control", ATTR{power/control}="on"

2
testsuite/tools/data/udev.ref
Wyświetl plik

@ -23,7 +23,7 @@
# If the scanner is supported by sane-backends, please mail the entry to
# the sane-devel mailing list (sane-devel@alioth-lists.debian.net).
#
ACTION!="add", GOTO="libsane_rules_end"
ACTION=="remove", GOTO="libsane_rules_end"
ENV{DEVTYPE}=="usb_device", GOTO="libsane_create_usb_dev"
SUBSYSTEMS=="scsi", GOTO="libsane_scsi_rules_begin"
SUBSYSTEM=="usb_device", GOTO="libsane_usb_rules_begin"

4
tools/sane-desc.c
Wyświetl plik

@ -3496,7 +3496,7 @@ print_udev (void)
int i;
print_udev_header ();
printf("ACTION!=\"add\", GOTO=\"libsane_rules_end\"\n"
printf("ACTION==\"remove\", GOTO=\"libsane_rules_end\"\n"
"ENV{DEVTYPE}==\"usb_device\", GOTO=\"libsane_create_usb_dev\"\n"
"SUBSYSTEMS==\"scsi\", GOTO=\"libsane_scsi_rules_begin\"\n"
"SUBSYSTEM==\"usb_device\", GOTO=\"libsane_usb_rules_begin\"\n"
@ -3679,7 +3679,7 @@ print_udevhwdb (void)
int i;
print_udevhwdb_header ();
printf("ACTION!=\"add\", GOTO=\"libsane_rules_end\"\n\n");
printf("ACTION==\"remove\", GOTO=\"libsane_rules_end\"\n\n");
printf("# The following rule will disable USB autosuspend for the device\n");
printf("ENV{DEVTYPE}==\"usb_device\", ENV{libsane_matched}==\"yes\", TEST==\"power/control\", ATTR{power/control}=\"on\"\n\n");