diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-07-23 20:10:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-23 20:10:38 +0200 |
| commit | 915fa2854916740c57704b2cb897407d401a9a3d (patch) | |
| tree | 00bf7dfb4c8f2893a37f458e2361d3df1bae97da /src/login | |
| parent | make dir-locals work again with emacs 26.1 (diff) | |
| parent | Do not apply uaccess tag for /dev/kvm if mode is 0666 (diff) | |
| download | systemd-915fa2854916740c57704b2cb897407d401a9a3d.tar.xz systemd-915fa2854916740c57704b2cb897407d401a9a3d.zip | |
Merge pull request #9560 from mbiebl/uaccess-dev-kvm
Re-add uaccess tag for /dev/kvm
Diffstat (limited to 'src/login')
| -rw-r--r-- | src/login/70-uaccess.rules.m4 (renamed from src/login/70-uaccess.rules) | 4 | ||||
| -rw-r--r-- | src/login/meson.build | 13 |
2 files changed, 13 insertions, 4 deletions
diff --git a/src/login/70-uaccess.rules b/src/login/70-uaccess.rules.m4 index 3515d292ac..d55e5bf5ce 100644 --- a/src/login/70-uaccess.rules +++ b/src/login/70-uaccess.rules.m4 @@ -46,6 +46,10 @@ SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x014001*", TAG+="uaccess" # DRI video devices SUBSYSTEM=="drm", KERNEL=="card*", TAG+="uaccess" +m4_ifdef(`DEV_KVM_UACCESS',`` +# KVM +SUBSYSTEM=="misc", KERNEL=="kvm", TAG+="uaccess"'' +)m4_dnl # smart-card readers ENV{ID_SMARTCARD_READER}=="?*", TAG+="uaccess" diff --git a/src/login/meson.build b/src/login/meson.build index 4326a452c6..0e1ed18f7a 100644 --- a/src/login/meson.build +++ b/src/login/meson.build @@ -81,10 +81,6 @@ if conf.get('ENABLE_LOGIND') == 1 install_data('70-power-switch.rules', install_dir : udevrulesdir) - if conf.get('HAVE_ACL') == 1 - install_data('70-uaccess.rules', install_dir : udevrulesdir) - endif - seat_rules = configure_file( input : '71-seat.rules.in', output : '71-seat.rules', @@ -93,6 +89,15 @@ if conf.get('ENABLE_LOGIND') == 1 install_dir : udevrulesdir) custom_target( + '70-uaccess.rules', + input : '70-uaccess.rules.m4', + output: '70-uaccess.rules', + command : [meson_apply_m4, config_h, '@INPUT@'], + capture : true, + install : conf.get('HAVE_ACL') == 1, + install_dir : udevrulesdir) + + custom_target( '73-seat-late.rules', input : '73-seat-late.rules.m4', output: '73-seat-late.rules', |