Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Sync with what is currently done in GNOME Shell
- Loading branch information
Showing
4 changed files
with
67 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,10 @@ | ||
[Unit] | ||
Description=Gala on X11 | ||
Description=Gala | ||
DefaultDependencies=no | ||
|
||
Requisite=gnome-session-initialized.target | ||
PartOf=gnome-session-initialized.target | ||
Before=gnome-session-initialized.target | ||
|
||
Requires=gala-x11.service | ||
After=gala-x11.service | ||
Wants=io.elementary.gala@wayland.service | ||
Wants=io.elementary.gala@x11.service |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
[Unit] | ||
Description=Gala on Wayland | ||
# On wayland, force a session shutdown | ||
OnFailure=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 | ||
|
||
#NOTE: ConditionEnvironment works with systemd >= 246 | ||
ConditionEnvironment=XDG_SESSION_TYPE=%I | ||
|
||
[Service] | ||
Slice=session.slice | ||
Type=notify | ||
ExecStart=@bindir@/gala | ||
# Exit code 1 means we are probably *not* dealing with an extension failure | ||
SuccessExitStatus=1 | ||
|
||
# unset some environment variables that were set by the compositor and won't work now that the compositor is gone | ||
ExecStopPost=-/bin/sh -c 'test "$SERVICE_RESULT" != "exec-condition" && 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 | ||
|
||
# Lower down Gala's OOM score to avoid being killed by OOM-killer too early | ||
OOMScoreAdjust=-1000 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters