From fb0b27dd63ee98efe8344080199602bbf39a35a6 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Mon, 17 Sep 2012 08:15:43 +0000 Subject: 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 --- meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service | 10 ---------- meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in | 10 ++++++++++ meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend | 11 ++++++++--- 3 files changed, 18 insertions(+), 13 deletions(-) delete mode 100644 meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service create mode 100644 meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in (limited to 'meta-systemd') diff --git a/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service b/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service deleted file mode 100644 index 0f94e0c8c..000000000 --- a/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Gnome Display Manager -After=systemd-user-sessions.service - -[Service] -ExecStart=/usr/sbin/gdm -nodaemon -StandardOutput=syslog - -[Install] -Alias=display-manager.service diff --git a/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in b/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in new file mode 100644 index 000000000..3e1556ae0 --- /dev/null +++ b/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in @@ -0,0 +1,10 @@ +[Unit] +Description=Gnome Display Manager +After=systemd-user-sessions.service + +[Service] +ExecStart=%sbindir%/gdm -nodaemon +StandardOutput=syslog + +[Install] +Alias=display-manager.service 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" -- cgit v1.2.3-54-g00ecf