diff options
| author | Dimitri John Ledkov <xnox@ubuntu.com> | 2017-08-17 14:20:39 (GMT) |
|---|---|---|
| committer | Dimitri John Ledkov <xnox@ubuntu.com> | 2017-08-18 12:35:17 (GMT) |
| commit | 6bd0dab41e720a297068a0600b121deb86ec5d1f (patch) | |
| tree | bab6ae8e31163b9f61536cfeb43a6b778a1461d0 | |
| parent | 2c4f8266d704c64614c62b178873b1a449ce23d6 (diff) | |
Disable KillUserProcesses, yet again, with meson this time.
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rw-r--r-- | debian/tests/control | 3 | ||||
| -rwxr-xr-x | debian/tests/logind-kill-off | 5 |
3 files changed, 9 insertions, 1 deletions
diff --git a/debian/rules b/debian/rules index cb264b1..fe5f430 100755 --- a/debian/rules +++ b/debian/rules @@ -50,7 +50,7 @@ CONFFLAGS = \ -Dzshcompletiondir=/usr/share/zsh/vendor-completions \ -Ddbuspolicydir=/usr/share/dbus-1/system.d/ \ -Dsupport-url=$(SUPPORT_URL) \ - -Dkill-user-processes=false \ + -Ddefault-kill-user-processes=false \ -Dpamconfdir=no \ -Dqrencode=false \ -Dvconsole=false \ diff --git a/debian/tests/control b/debian/tests/control index 84fe8f9..00f80fd 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -128,6 +128,9 @@ Depends: libsystemd-dev, fdisk | util-linux (<< 2.29.2-3~) Restrictions: needs-root, allow-stderr, isolation-machine +Tests: logind-kill-off +Depends: systemd + Tests: boot-smoke Depends: libsystemd-dev, tree, diff --git a/debian/tests/logind-kill-off b/debian/tests/logind-kill-off new file mode 100755 index 0000000..39467a1 --- /dev/null +++ b/debian/tests/logind-kill-off @@ -0,0 +1,5 @@ +#!/bin/sh +set -e +# Default KillUserProcesses should be off for debian/ubuntu builds +r=$(busctl get-property org.freedesktop.login1 /org/freedesktop/login1 org.freedesktop.login1.Manager KillUserProcesses) +[ "b false" = "$r" ] |