From fb0b27dd63ee98efe8344080199602bbf39a35a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 17 Sep 2012 08:15:43 +0000 Subject: [PATCH] gdm: do not hardcode /usr/sbin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller Signed-off-by: Koen Kooi --- .../gdm/gdm/{gdm.service => gdm.service.in} | 2 +- .../meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) rename meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/{gdm.service => gdm.service.in} (81%) 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 similarity index 81% rename from meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service rename to 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"