Permalink
Browse files

xserver-nodm-init: add EnvironmentFile

* used to set HOME variable before /etc/X11/Xsession is started
* e.g. enlightenment is creating ${HOME}/.e and without this it ends in
  /tmp/.e and during startup HOME gets defined and switched to
  /home/root/.e

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
  • Loading branch information...
1 parent 8f6027c commit 2cb1ae5c172d51df200cc09eb04ddae66bef6b6c @shr-project shr-project committed with koenkooi Apr 10, 2012
@@ -2,6 +2,7 @@
Description=Xserver startup with a display manager
[Service]
+EnvironmentFile=/etc/default/xserver-nodm
ExecStart=/usr/bin/xinit /etc/X11/Xsession -- /etc/X11/Xserver
[Install]
@@ -3,10 +3,11 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
SECTION = "x11"
-PR = "r14"
+PR = "r16"
SRC_URI = "file://xserver-nodm \
file://xserver-nodm.service \
+ file://xserver-nodm.conf \
file://gplv2-license.patch \
"
S = "${WORKDIR}"
@@ -25,7 +26,11 @@ SYSTEMD_SERVICE_${PN}-systemd = "xserver-nodm.service"
do_install() {
install -d ${D}${sysconfdir}/init.d
install xserver-nodm ${D}${sysconfdir}/init.d
+ install -d ${D}${sysconfdir}/default
+ install xserver-nodm.conf ${D}${sysconfdir}/default/xserver-nodm
}
+FILES_${PN}-systemd += "${sysconfdir}/default/xserver-nodm"
+
RDEPENDS_${PN} = "xserver-common (>= 1.30) xinit"
RDEPENDS_${PN}-systemd += "xserver-common (>= 1.30) xinit"

0 comments on commit 2cb1ae5

Please sign in to comment.