aboutsummaryrefslogtreecommitdiffstats
path: root/meta-systemd/meta-gnome/recipes-gnome/gdm
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2012-09-17 08:15:43 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2012-09-17 10:42:30 +0200
commitfb0b27dd63ee98efe8344080199602bbf39a35a6 (patch)
tree91e23e91ea513722bfb0e5c628b991082febeda3 /meta-systemd/meta-gnome/recipes-gnome/gdm
parent4ac49b2ac22eb13f2c3f0ed63418c871af52ff46 (diff)
downloadmeta-openembedded-contrib-fb0b27dd63ee98efe8344080199602bbf39a35a6.tar.gz
gdm: do not hardcode /usr/sbin
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-systemd/meta-gnome/recipes-gnome/gdm')
-rw-r--r--meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in (renamed from meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service)2
-rw-r--r--meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend11
2 files changed, 9 insertions, 4 deletions
diff --git a/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service b/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in
index 0f94e0c8c8..3e1556ae0e 100644
--- a/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service
+++ b/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in
@@ -3,7 +3,7 @@ Description=Gnome Display Manager
After=systemd-user-sessions.service
[Service]
-ExecStart=/usr/sbin/gdm -nodaemon
+ExecStart=%sbindir%/gdm -nodaemon
StandardOutput=syslog
[Install]
diff --git a/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend b/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend
index 496a2769d6..45b47c3365 100644
--- a/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend
+++ b/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend
@@ -5,9 +5,14 @@ PRINC := "${@int(PRINC) + 3}"
inherit systemd
-SRC_URI += " \
- file://gdm.service \
- "
+SRC_URI += "file://gdm.service.in"
+
+do_install_append() {
+ install -d ${D}${systemd_unitdir}/system
+ sed -e 's,%sbindir%,${sbindir},g' \
+ < ${WORKDIR}/gdm.service.in \
+ > ${D}${systemd_unitdir}/system/gdm.service
+}
SYSTEMD_PACKAGES = "${PN}-systemd"
SYSTEMD_SERVICE = "gdm.service"