summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenry Gebhardt <hsggebhardt@googlemail.com>2010-12-12 10:12:11 +0100
committerHenry Gebhardt <hsggebhardt@googlemail.com>2010-12-12 10:12:11 +0100
commit332ae17ee9dc8ca30d3112f25c3492ca54fb97eb (patch)
treea7c8886b3a7944ea300be0725ff190c4947ee424 /sys-apps/systemd-units/files/services-desktop
parentnet-wireless/bluez-4.81: Version bump (diff)
parentsys-apps/systemd-units-9999: Add message for gdm@.service change (diff)
downloadsystemd-332ae17ee9dc8ca30d3112f25c3492ca54fb97eb.tar.gz
systemd-332ae17ee9dc8ca30d3112f25c3492ca54fb97eb.tar.bz2
systemd-332ae17ee9dc8ca30d3112f25c3492ca54fb97eb.zip
Merge branch 'gdm'
Conflicts: sys-apps/systemd-units/Manifest
Diffstat (limited to 'sys-apps/systemd-units/files/services-desktop')
-rw-r--r--sys-apps/systemd-units/files/services-desktop/gdm.service12
-rw-r--r--sys-apps/systemd-units/files/services-desktop/gdm@.service11
2 files changed, 11 insertions, 12 deletions
diff --git a/sys-apps/systemd-units/files/services-desktop/gdm.service b/sys-apps/systemd-units/files/services-desktop/gdm.service
deleted file mode 100644
index e29643a..0000000
--- a/sys-apps/systemd-units/files/services-desktop/gdm.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Gnome Display Manager
-After=hald.service
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/gdm -nodaemon
-ExecStop=/usr/sbin/gdm-stop
-
-[Install]
-Alias=display-manager.service
-WantedBy=graphical.target
diff --git a/sys-apps/systemd-units/files/services-desktop/gdm@.service b/sys-apps/systemd-units/files/services-desktop/gdm@.service
new file mode 100644
index 0000000..ce9e789
--- /dev/null
+++ b/sys-apps/systemd-units/files/services-desktop/gdm@.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Gnome Display Manager on %I
+Requires=dev-%i.device
+After=dev-%i.device systemd-user-sessions.service
+
+[Service]
+ExecStart=/usr/bin/gdm -nodaemon
+ExecStop=/usr/sbin/gdm-stop
+
+[Install]
+Alias=graphical.target.wants/gdm@tty7.service