[OE-core] [PATCH 31/42] xserver-nodm-init: Fix usage of systemd unitdir vars

Pau Espin Pedrol pespin.shar at gmail.com
Sun Mar 13 19:13:29 UTC 2016


Signed-off-by: Pau Espin Pedrol <pespin.shar at gmail.com>
---
 meta/recipes-graphics/x11-common/xserver-nodm-init.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
index b68d40e..650ebe0 100644
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
@@ -25,14 +25,14 @@ do_install() {
     if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
         install -d ${D}${sysconfdir}/default
         install xserver-nodm.conf ${D}${sysconfdir}/default/xserver-nodm
-        install -d ${D}${systemd_unitdir}/system
-        install -m 0644 ${WORKDIR}/xserver-nodm.service ${D}${systemd_unitdir}/system
+        install -d ${D}${systemd_system_unitdir}
+        install -m 0644 ${WORKDIR}/xserver-nodm.service ${D}${systemd_system_unitdir}
         if [ "${ROOTLESS_X}" = "1" ] ; then
             sed -i 's!^HOME=.*!HOME=/home/xuser!' ${D}${sysconfdir}/default/xserver-nodm
-            sed -i 's!^User=.*!User=xuser!' ${D}${systemd_unitdir}/system/xserver-nodm.service
+            sed -i 's!^User=.*!User=xuser!' ${D}${systemd_system_unitdir}/xserver-nodm.service
         else
             sed -i 's!^HOME=.*!HOME=${ROOT_HOME}!' ${D}${sysconfdir}/default/xserver-nodm
-            sed -i '/^User=/d' ${D}${systemd_unitdir}/system/xserver-nodm.service
+            sed -i '/^User=/d' ${D}${systemd_system_unitdir}/xserver-nodm.service
         fi
     fi
 
-- 
2.7.1




More information about the Openembedded-core mailing list