From f58400b8b83b9f49334c48cc323a5d78034a11ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mantas=20Mikul=C4=97nas?= Date: Tue, 1 Oct 2019 21:05:58 +0300 Subject: [PATCH 1/2] data: Make gnome-shell-x11.service restart when .target is restarted --- data/gnome-shell-wayland.service.in | 2 ++ data/gnome-shell-x11.service.in | 2 ++ 2 files changed, 4 insertions(+) diff --git a/data/gnome-shell-wayland.service.in b/data/gnome-shell-wayland.service.in index 04f94af2d6..71c2ef1f86 100644 --- a/data/gnome-shell-wayland.service.in +++ b/data/gnome-shell-wayland.service.in @@ -13,6 +13,8 @@ Requisite=gnome-session-initialized.target PartOf=gnome-session-initialized.target Before=gnome-session-initialized.target +PartOf=gnome-shell-wayland.target + # The units already conflict because they use the same BusName #Conflicts=gnome-shell-x11.service diff --git a/data/gnome-shell-x11.service.in b/data/gnome-shell-x11.service.in index a10c33d29d..76236f033a 100644 --- a/data/gnome-shell-x11.service.in +++ b/data/gnome-shell-x11.service.in @@ -13,6 +13,8 @@ Requisite=gnome-session-initialized.target PartOf=gnome-session-initialized.target Before=gnome-session-initialized.target +PartOf=gnome-shell-x11.target + # The units already conflict because they use the same BusName #Conflicts=gnome-shell-wayland.service -- GitLab From c7e6ad9341df7a5945cc5da24a1bafd5bb4a130f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mantas=20Mikul=C4=97nas?= Date: Tue, 1 Oct 2019 21:06:26 +0300 Subject: [PATCH 2/2] data: Retain gnome-shell-x11 subprocesses after restart This allows restarting gnome-shell-x11.target without it killing all apps which might be running within gnome-shell's cgroup. --- data/gnome-shell-x11.service.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/gnome-shell-x11.service.in b/data/gnome-shell-x11.service.in index 76236f033a..c65363edb7 100644 --- a/data/gnome-shell-x11.service.in +++ b/data/gnome-shell-x11.service.in @@ -31,5 +31,5 @@ SuccessExitStatus=1 Restart=always # Do not wait before restarting the shell RestartSec=0ms -# Kill any stubborn child processes after this long -TimeoutStopSec=5 +# Do not kill subprocesses (non-bus-activated apps launched by the user) +KillMode=process -- GitLab