aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-07-23 20:10:38 +0200
committerGitHub <noreply@github.com>2018-07-23 20:10:38 +0200
commit915fa2854916740c57704b2cb897407d401a9a3d (patch)
tree00bf7dfb4c8f2893a37f458e2361d3df1bae97da /meson.build
parentmake dir-locals work again with emacs 26.1 (diff)
parentDo not apply uaccess tag for /dev/kvm if mode is 0666 (diff)
downloadsystemd-915fa2854916740c57704b2cb897407d401a9a3d.tar.gz
systemd-915fa2854916740c57704b2cb897407d401a9a3d.tar.bz2
systemd-915fa2854916740c57704b2cb897407d401a9a3d.zip
Merge pull request #9560 from mbiebl/uaccess-dev-kvm
Re-add uaccess tag for /dev/kvm
Diffstat (limited to 'meson.build')
-rw-r--r--meson.build4
1 files changed, 3 insertions, 1 deletions
diff --git a/meson.build b/meson.build
index e72d8c685..d88abde9a 100644
--- a/meson.build
+++ b/meson.build
@@ -752,7 +752,9 @@ substs.set('USERS_GID', users_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'))
kill_user_processes = get_option('default-kill-user-processes')