diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-07 10:02:33 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-07 10:02:33 +0200 |
commit | dc008569a22879a818aecc84687556c06ea07a5f (patch) | |
tree | d1f106ba2a41cbcc1ca96514a255429083862f91 /core/systemd/0001-rules-move-builtin-calls-before-the-permissions-sect.patch | |
parent | 3ee99b867d6426de0284d34340f179a4966975a5 (diff) | |
parent | 5abba8ccfedfb13f07a34eb4b6afbe4f30a8f767 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/arpwatch/PKGBUILD
community/partclone/PKGBUILD
community/pidgin-libnotify/PKGBUILD
core/systemd/PKGBUILD
extra/subversion/PKGBUILD
Diffstat (limited to 'core/systemd/0001-rules-move-builtin-calls-before-the-permissions-sect.patch')
-rw-r--r-- | core/systemd/0001-rules-move-builtin-calls-before-the-permissions-sect.patch | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/core/systemd/0001-rules-move-builtin-calls-before-the-permissions-sect.patch b/core/systemd/0001-rules-move-builtin-calls-before-the-permissions-sect.patch deleted file mode 100644 index 88dabe9d3..000000000 --- a/core/systemd/0001-rules-move-builtin-calls-before-the-permissions-sect.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 34b99a8bf7b769b31ad59ff0d60f8572bd0adab5 Mon Sep 17 00:00:00 2001 -From: Kay Sievers <kay@vrfy.org> -Date: Wed, 20 Mar 2013 01:26:17 +0100 -Subject: [PATCH] rules: move builtin calls before the permissions section - -<heftig> kay: systemd commit 22582bb broke cups usb printing for me -<heftig> because the "lp" group isn't applied anymore -<heftig> SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:*", GROUP="lp" -<heftig> moving this line to the end of 50-udev-default.rules restores correct behavior, as it's after usb_id - -Conflicts: - rules/50-udev-default.rules ---- - rules/50-udev-default.rules | 17 ++++++++++------- - 1 file changed, 10 insertions(+), 7 deletions(-) - -diff --git a/rules/50-udev-default.rules b/rules/50-udev-default.rules -index 5d8bde5..ce0a4ef 100644 ---- a/rules/50-udev-default.rules -+++ b/rules/50-udev-default.rules -@@ -1,5 +1,13 @@ - # do not edit this file, it will be overwritten on update - -+SUBSYSTEM=="rtc", ATTR{hctosys}=="1", SYMLINK+="rtc" -+SUBSYSTEM=="virtio-ports", KERNEL=="vport*", ATTR{name}=="?*", SYMLINK+="virtio-ports/$attr{name}" -+ -+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=usb" -+SUBSYSTEM=="input", ENV{ID_INPUT}=="", IMPORT{builtin}="input_id" -+SUBSYSTEM=="firmware", ACTION=="add", IMPORT{builtin}="firmware" -+ENV{MODALIAS}!="", IMPORT{builtin}="hwdb --subsystem=$env{SUBSYSTEM}" -+ - ACTION!="add", GOTO="default_permissions_end" - - SUBSYSTEM=="tty", KERNEL=="ptmx", GROUP="tty", MODE="0666" -@@ -8,6 +16,8 @@ SUBSYSTEM=="tty", KERNEL=="tty[0-9]*", GROUP="tty", MODE="0620" - SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty" - KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout" - -+SUBSYSTEM=="rtc", ATTR{hctosys}=="1", MODE="0644" -+ - SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640" - - SUBSYSTEM=="input", KERNEL=="mouse*|mice|event*", MODE="0640" -@@ -59,10 +69,3 @@ KERNEL=="tun", MODE="0666", OPTIONS+="static_node=net/tun" - KERNEL=="fuse", MODE="0666", OPTIONS+="static_node=fuse" - - LABEL="default_permissions_end" --SUBSYSTEM=="rtc", ATTR{hctosys}=="1", MODE="0644", SYMLINK+="rtc" --SUBSYSTEM=="virtio-ports", KERNEL=="vport*", ATTR{name}=="?*", SYMLINK+="virtio-ports/$attr{name}" -- --SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=usb" --SUBSYSTEM=="input", ENV{ID_INPUT}=="", IMPORT{builtin}="input_id" --SUBSYSTEM=="firmware", ACTION=="add", IMPORT{builtin}="firmware" --ENV{MODALIAS}!="", IMPORT{builtin}="hwdb --subsystem=$env{SUBSYSTEM}" --- -1.8.2 - |