summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Persch <chpe@src.gnome.org>2020-02-04 18:13:47 +0100
committerChristian Persch <chpe@src.gnome.org>2020-02-04 18:13:47 +0100
commit9e8168d9e510388842c09296e5beea0c7ec8bcff (patch)
treea4e2bd46945134f1f3860e5bfaa42ae611e97957 /src
parent1d488966c70f97a86962e0f4a470451bf1cd223d (diff)
downloadvte-9e8168d9e510388842c09296e5beea0c7ec8bcff.tar.gz
systemd: Install config drop-in for vte-spawn-.scope
Diffstat (limited to 'src')
-rw-r--r--src/meson.build10
-rw-r--r--src/systemd.cc1
-rw-r--r--src/vte-spawn-.scope.conf6
3 files changed, 16 insertions, 1 deletions
diff --git a/src/meson.build b/src/meson.build
index 4242dd61..352b5af9 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -563,6 +563,16 @@ vte_sh = configure_file(
install_dir: vte_sysconfdir / 'profile.d',
)
+# Systemd integration
+
+if host_machine.system() == 'linux'
+ install_data(
+ sources: 'vte-spawn-.scope.conf',
+ install_dir: vte_systemduserunitdir / 'vte-spawn-.scope.d',
+ rename: 'defaults.conf'
+ )
+endif
+
# Demo application
subdir('app')
diff --git a/src/systemd.cc b/src/systemd.cc
index 4ba40c6a..eeefd2f8 100644
--- a/src/systemd.cc
+++ b/src/systemd.cc
@@ -65,7 +65,6 @@ create_scope_for_pid_sync(pid_t pid,
// Unit properties
g_variant_builder_open(builder, G_VARIANT_TYPE("a(sv)"));
- g_variant_builder_add(builder, "(sv)", "CollectMode", g_variant_new_string("inactive-or-failed"));
g_variant_builder_add(builder, "(sv)", "Description", g_variant_new_string(description.get()));
g_variant_builder_open(builder, G_VARIANT_TYPE("(sv)"));
diff --git a/src/vte-spawn-.scope.conf b/src/vte-spawn-.scope.conf
new file mode 100644
index 00000000..51ef27df
--- /dev/null
+++ b/src/vte-spawn-.scope.conf
@@ -0,0 +1,6 @@
+[Unit]
+CollectMode=inactive-or-failed
+
+[Scope]
+KillMode=process
+TimeoutStopSec=5s