|
 |
1e501a |
From 6415083d3913e8f0da43161fb8c493ff3bfdfcee Mon Sep 17 00:00:00 2001
|
|
|
01018b |
From: Ray Strode <rstrode@redhat.com>
|
|
|
01018b |
Date: Fri, 14 Mar 2014 11:04:49 -0400
|
|
|
1e501a |
Subject: [PATCH 1/2] systemd: clear terminal after starting
|
|
|
01018b |
|
|
|
01018b |
This helps with flicker when the X server shuts down.
|
|
|
01018b |
---
|
|
|
1e501a |
data/gdm.service.in | 1 +
|
|
|
1e501a |
1 file changed, 1 insertion(+)
|
|
|
01018b |
|
|
|
01018b |
diff --git a/data/gdm.service.in b/data/gdm.service.in
|
|
|
1e501a |
index 9090cf4..87785b8 100644
|
|
|
01018b |
--- a/data/gdm.service.in
|
|
|
01018b |
+++ b/data/gdm.service.in
|
|
|
1e501a |
@@ -1,32 +1,33 @@
|
|
|
01018b |
[Unit]
|
|
|
01018b |
Description=GNOME Display Manager
|
|
|
1e501a |
|
|
|
1e501a |
# replaces the getty
|
|
|
1e501a |
Conflicts=getty@tty@GDM_INITIAL_VT@.service
|
|
|
1e501a |
After=getty@tty@GDM_INITIAL_VT@.service
|
|
|
1e501a |
|
|
|
1e501a |
# replaces plymouth-quit since it quits plymouth on its own
|
|
|
1e501a |
Conflicts=plymouth-quit.service
|
|
|
1e501a |
After=plymouth-quit.service
|
|
|
1e501a |
|
|
|
1e501a |
# Needs all the dependencies of the services it's replacing
|
|
|
1e501a |
# pulled from getty@.service and plymouth-quit.service
|
|
|
1e501a |
# (except for plymouth-quit-wait.service since it waits until
|
|
|
1e501a |
# plymouth is quit, which we do)
|
|
|
1e501a |
After=rc-local.service plymouth-start.service systemd-user-sessions.service
|
|
|
1e501a |
|
|
|
1e501a |
# GDM takes responsibility for stopping plymouth, so if it fails
|
|
|
1e501a |
# for any reason, make sure plymouth still stops
|
|
|
1e501a |
OnFailure=plymouth-quit.service
|
|
|
01018b |
|
|
|
01018b |
[Service]
|
|
|
01018b |
ExecStart=@sbindir@/gdm
|
|
|
01018b |
+ExecStartPost=-/bin/bash -c "TERM=linux /usr/bin/clear > /dev/tty1"
|
|
|
01018b |
Restart=always
|
|
|
01018b |
IgnoreSIGPIPE=no
|
|
|
01018b |
BusName=org.gnome.DisplayManager
|
|
|
01018b |
StandardOutput=syslog
|
|
|
01018b |
StandardError=inherit
|
|
|
1e501a |
EnvironmentFile=-@LANG_CONFIG_FILE@
|
|
|
1e501a |
|
|
|
1e501a |
[Install]
|
|
|
1e501a |
Alias=display-manager.service
|
|
|
1e501a |
--
|
|
|
1e501a |
2.3.7
|
|
|
1e501a |
|
|
|
1e501a |
|
|
|
1e501a |
From 729d74412cee774c5ccd2b8a7d82eda6e3fc65b2 Mon Sep 17 00:00:00 2001
|
|
|
1e501a |
From: Ray Strode <rstrode@redhat.com>
|
|
|
1e501a |
Date: Mon, 30 Mar 2015 21:53:33 -0400
|
|
|
1e501a |
Subject: [PATCH 2/2] systemd: change to KillMode=mixed
|
|
|
1e501a |
|
|
|
1e501a |
By default systemd will kill the entire control-group in one fell
|
|
|
1e501a |
swoop. The problem is, things don't get shutdown in the right
|
|
|
1e501a |
order then, and there's a race where GDM will begin restarting
|
|
|
1e501a |
X servers as soon as they're killed.
|
|
|
1e501a |
|
|
|
1e501a |
This commit tells systemd to just kill the main GDM process, and
|
|
|
1e501a |
let it handle killing all its children on its own.
|
|
|
1e501a |
|
|
|
1e501a |
https://bugzilla.gnome.org/show_bug.cgi?id=747088
|
|
|
1e501a |
---
|
|
|
1e501a |
data/gdm.service.in | 1 +
|
|
|
1e501a |
1 file changed, 1 insertion(+)
|
|
|
1e501a |
|
|
|
1e501a |
diff --git a/data/gdm.service.in b/data/gdm.service.in
|
|
|
1e501a |
index 87785b8..47cdcf2 100644
|
|
|
1e501a |
--- a/data/gdm.service.in
|
|
|
1e501a |
+++ b/data/gdm.service.in
|
|
|
1e501a |
@@ -1,33 +1,34 @@
|
|
|
1e501a |
[Unit]
|
|
|
1e501a |
Description=GNOME Display Manager
|
|
|
1e501a |
|
|
|
1e501a |
# replaces the getty
|
|
|
1e501a |
Conflicts=getty@tty@GDM_INITIAL_VT@.service
|
|
|
1e501a |
After=getty@tty@GDM_INITIAL_VT@.service
|
|
|
1e501a |
|
|
|
1e501a |
# replaces plymouth-quit since it quits plymouth on its own
|
|
|
1e501a |
Conflicts=plymouth-quit.service
|
|
|
1e501a |
After=plymouth-quit.service
|
|
|
1e501a |
|
|
|
1e501a |
# Needs all the dependencies of the services it's replacing
|
|
|
1e501a |
# pulled from getty@.service and plymouth-quit.service
|
|
|
1e501a |
# (except for plymouth-quit-wait.service since it waits until
|
|
|
1e501a |
# plymouth is quit, which we do)
|
|
|
1e501a |
After=rc-local.service plymouth-start.service systemd-user-sessions.service
|
|
|
1e501a |
|
|
|
1e501a |
# GDM takes responsibility for stopping plymouth, so if it fails
|
|
|
1e501a |
# for any reason, make sure plymouth still stops
|
|
|
1e501a |
OnFailure=plymouth-quit.service
|
|
|
1e501a |
|
|
|
1e501a |
[Service]
|
|
|
1e501a |
ExecStart=@sbindir@/gdm
|
|
|
1e501a |
ExecStartPost=-/bin/bash -c "TERM=linux /usr/bin/clear > /dev/tty1"
|
|
|
1e501a |
+KillMode=mixed
|
|
|
1e501a |
Restart=always
|
|
|
1e501a |
IgnoreSIGPIPE=no
|
|
|
1e501a |
BusName=org.gnome.DisplayManager
|
|
|
1e501a |
StandardOutput=syslog
|
|
|
1e501a |
StandardError=inherit
|
|
|
1e501a |
EnvironmentFile=-@LANG_CONFIG_FILE@
|
|
|
01018b |
|
|
|
01018b |
[Install]
|
|
|
01018b |
Alias=display-manager.service
|
|
|
01018b |
--
|
|
|
1e501a |
2.3.7
|
|
|
01018b |
|