41d5b1455f
Move the GNOME shell service file adapation for x11/wayland into the target/service files. This means that the session definition can simply pull in org.gnome.Shell.target, without having to care about whether it is starting an X11 or wayland session. Note that this currently requires fork'ing to do the test. This will however not be needed in the long term when ConditionEnvironment becomes available (see https://github.com/systemd/systemd/pull/15817). We technically do not need to use template units. But doing so means that the unit can be translated to the app id more easily (though it is not yet completely clear how this should look like in the long term). https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/895
34 lines
1.2 KiB
SYSTEMD
34 lines
1.2 KiB
SYSTEMD
[Unit]
|
|
Description=GNOME Shell on Wayland
|
|
# On wayland, force a session shutdown
|
|
OnFailure=org.gnome.Shell-disable-extensions.service gnome-session-shutdown.target
|
|
OnFailureJobMode=replace-irreversibly
|
|
CollectMode=inactive-or-failed
|
|
RefuseManualStart=on
|
|
RefuseManualStop=on
|
|
|
|
After=gnome-session-manager.target
|
|
|
|
Requisite=gnome-session-initialized.target
|
|
PartOf=gnome-session-initialized.target
|
|
Before=gnome-session-initialized.target
|
|
|
|
[Service]
|
|
Type=notify
|
|
# NOTE: This can be replaced with ConditionEnvironment=XDG_SESSION_TYPE=%I
|
|
# with systemd >= 245. Also, the current solution is kind of painful
|
|
# as systemd had a bug where it retries the condition.
|
|
# Only start if the template instance matches the session type.
|
|
ExecCondition=/bin/sh -c 'test "$XDG_SESSION_TYPE" = "%I" || exit 2'
|
|
ExecStart=@bindir@/gnome-shell
|
|
# Exit code 1 means we are probably *not* dealing with an extension failure
|
|
SuccessExitStatus=1
|
|
|
|
# unset some environment variables that were set by the shell and won't work now that the shell is gone
|
|
ExecStopPost=-systemctl --user unset-environment GNOME_SETUP_DISPLAY WAYLAND_DISPLAY DISPLAY XAUTHORITY
|
|
|
|
# On wayland we cannot restart
|
|
Restart=no
|
|
# Kill any stubborn child processes after this long
|
|
TimeoutStopSec=5
|