Merge pull request #20813 from unusual-thoughts/exittype_v2

Reintroduce ExitType

test/units/testsuite-56.service

@@ -0,0 +1,6 @@
+[Unit]
+Description=TEST-56-EXIT-TYPE
+
+[Service]
+ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
+Type=oneshot

test/units/testsuite-56.sh

@@ -0,0 +1,79 @@
+#!/usr/bin/env bash
+set -eux
+
+systemd-analyze log-level debug
+
+# Multiple level process tree, parent process stays up
+cat >/tmp/test56-exit-cgroup.sh <<EOF
+#!/usr/bin/env bash
+set -eux
+
+# process tree: systemd -> sleep
+sleep infinity &
+disown
+
+# process tree: systemd -> bash -> bash -> sleep
+((sleep infinity); true) &
+
+systemd-notify --ready
+
+# process tree: systemd -> bash -> sleep
+sleep infinity
+EOF
+chmod +x /tmp/test56-exit-cgroup.sh
+
+# service should be stopped cleanly
+systemd-run --wait --unit=one -p Type=notify -p ExitType=cgroup \
+    -p ExecStartPost='bash -c "systemctl stop one &"' \
+    /tmp/test56-exit-cgroup.sh
+
+# same thing with a truthy exec condition
+systemd-run --wait --unit=two -p Type=notify -p ExitType=cgroup \
+    -p ExecCondition=true \
+    -p ExecStartPost='bash -c "systemctl stop two &"' \
+    /tmp/test56-exit-cgroup.sh
+
+# false exec condition: systemd-run should exit immediately with status code: 1
+systemd-run --wait --unit=three -p Type=notify -p ExitType=cgroup \
+    -p ExecCondition=false \
+    /tmp/test56-exit-cgroup.sh \
+    && { echo 'unexpected success'; exit 1; }
+
+# service should exit uncleanly (main process exits with SIGKILL)
+systemd-run --wait --unit=four -p Type=notify -p ExitType=cgroup \
+    -p ExecStartPost='bash -c "systemctl kill --signal 9 four &"' \
+    /tmp/test56-exit-cgroup.sh \
+    && { echo 'unexpected success'; exit 1; }
+
+
+# Multiple level process tree, parent process exits quickly
+cat >/tmp/test56-exit-cgroup-parentless.sh <<EOF
+#!/usr/bin/env bash
+set -eux
+
+# process tree: systemd -> sleep
+sleep infinity &
+
+# process tree: systemd -> bash -> sleep
+((sleep infinity); true) &
+
+systemd-notify --ready
+EOF
+chmod +x /tmp/test56-exit-cgroup-parentless.sh
+
+# service should be stopped cleanly
+systemd-run --wait --unit=five -p Type=notify -p ExitType=cgroup \
+    -p ExecStartPost='bash -c "systemctl stop five &"' \
+    /tmp/test56-exit-cgroup-parentless.sh
+
+# service should still exit cleanly despite SIGKILL (the main process already exited cleanly)
+systemd-run --wait --unit=six -p Type=notify -p ExitType=cgroup \
+    -p ExecStartPost='bash -c "systemctl kill --signal 9 six &"' \
+    /tmp/test56-exit-cgroup-parentless.sh
+
+
+systemd-analyze log-level info
+
+echo OK >/testok
+
+exit 0