gdm: do not hardcode /usr/sbin

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

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 0f94e0c8c..3e1556ae0 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 496a2769d..45b47c336 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"