X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=rules%2Frules.d%2F50-udev-default.rules;h=4e9a73751e53809c0f39f7017a472798910bd756;hb=f61e72d8973cf9d889a4f1233150870085c0b3e1;hp=aef3b601a44adca836289c0b8fa6253f35c0d8fb;hpb=214a6c791cbc0c1a190c430eb37056087e661344;p=elogind.git

diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules
index aef3b601a..4e9a73751 100644
--- a/rules/rules.d/50-udev-default.rules
+++ b/rules/rules.d/50-udev-default.rules
@@ -60,6 +60,10 @@ SUBSYSTEM=="ppdev",		GROUP="lp"
 SUBSYSTEM=="usb",		KERNEL=="lp*", NAME="usb/%k", SYMLINK+="usb%k", GROUP="lp"
 KERNEL=="lp[0-9]*",		GROUP="lp"
 KERNEL=="irlpt[0-9]*",		GROUP="lp"
+# hplip and cups 1.4+ use raw USB devices, so permissions should be similar to
+# the ones from the old usblp kernel module
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="", IMPORT{program}="usb_id --export %p"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}==":0701*:", GROUP="lp", MODE="660"
 
 # block
 SUBSYSTEM=="block", GROUP="disk"
@@ -94,7 +98,7 @@ SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440"
 
 # network
 KERNEL=="tun",			NAME="net/%k", MODE="0666"
-KERNEL=="rfkill",		MODE="0664"
+KERNEL=="rfkill",		MODE="0644"
 
 # CPU
 KERNEL=="cpu[0-9]*",		NAME="cpu/%n/cpuid", MODE="0444"