diff options
| author | Michael Biebl <biebl@debian.org> | 2018-07-13 23:36:13 +0200 |
|---|---|---|
| committer | Sven Eden <sven.eden@prydeworx.com> | 2018-10-29 10:18:24 +0100 |
| commit | 4eb33360e4320d4f582eed1a957948c34007bfd5 (patch) | |
| tree | e5bd5e2f6dd76e8485f1929169e3a9c19fa0ac25 | |
| parent | 15a9ae936ce860c4ba095bffb8ad9a524f426985 (diff) | |
Do not apply uaccess tag for /dev/kvm if mode is 0666
(cherry picked from commit ace5e3111c0b8d8bfd84b32f2c689b0a4d92c061)
| -rw-r--r-- | meson.build | 4 | ||||
| -rw-r--r-- | src/login/meson.build | 12 |
2 files changed, 11 insertions, 5 deletions
diff --git a/meson.build b/meson.build index cbe536538..a70f538c6 100644 --- a/meson.build +++ b/meson.build @@ -893,7 +893,9 @@ substs.set('TTY_GID', tty_gid) # conf.set10('ENABLE_ADM_GROUP', get_option('adm-group')) # conf.set10('ENABLE_WHEEL_GROUP', get_option('wheel-group')) # -# substs.set('DEV_KVM_MODE', get_option('dev-kvm-mode')) +# dev_kvm_mode = get_option('dev-kvm-mode') +# substs.set('DEV_KVM_MODE', dev_kvm_mode) +# conf.set10('DEV_KVM_UACCESS', dev_kvm_mode != '0666') # substs.set('GROUP_RENDER_MODE', get_option('group-render-mode')) #endif // 0 diff --git a/src/login/meson.build b/src/login/meson.build index 0eac0d3cc..f8c536464 100644 --- a/src/login/meson.build +++ b/src/login/meson.build @@ -125,10 +125,6 @@ loginctl_sources += files(''' 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', @@ -142,6 +138,14 @@ loginctl_sources += files(''' output : '73-seat-late.rules.m4', configuration : substs) #endif // 1 + 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', |