← Back to branch summary

~ken-vandine/gdm/ubuntu_transition_from_lightdm

« back to all changes in this revision

Viewing changes to debian/patches/92_systemd_unit.patch

  • Committer: Jeremy Bicha
  • Date: 2017-04-26 11:02:52 UTC
  • Revision ID: jbicha@ubuntu.com-20170426110252-of979orglkl75xgt
Tags: 3.24.1-0ubuntu1
Update to current artful package

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/92_systemd_unit.patch
 
1
--- a/data/gdm.service.in
 
2
+++ b/data/gdm.service.in
 
3
@@ -20,14 +20,17 @@
 
4
 OnFailure=plymouth-quit.service
 
5
 
 
6
 [Service]
 
7
-ExecStart=@sbindir@/gdm
 
8
+ExecStartPre=/bin/sh -c '[ "$(cat /etc/X11/default-display-manager 2>/dev/null)" = "/usr/sbin/gdm3" ]'
 
9
+ExecStartPre=/usr/share/gdm/generate-config
 
10
+ExecStart=@sbindir@/gdm3
 
11
+ExecReload=/bin/kill -HUP $MAINPID
 
12
+ExecReload=/usr/share/gdm/generate-config
 
13
 KillMode=mixed
 
14
 Restart=always
 
15
+RestartSec=1s
 
16
 IgnoreSIGPIPE=no
 
17
-BusName=org.gnome.DisplayManager
 
18
+# GDM is killed upon reload if BusName is set, let us forget it for now
 
19
+#BusName=org.gnome.DisplayManager
 
20
 StandardOutput=syslog
 
21
 StandardError=inherit
 
22
 EnvironmentFile=-@LANG_CONFIG_FILE@
 
23
-
 
24
-[Install]
 
25
-Alias=display-manager.service