Skip to content

Commit

Permalink
xserver-nodm-init: add EnvironmentFile
Browse files Browse the repository at this point in the history
* 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
shr-project authored and koenkooi committed Apr 10, 2012
1 parent 8f6027c commit 2cb1ae5
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
@@ -0,0 +1 @@
HOME=/home/root
Expand Up @@ -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]
Expand Down
Expand Up @@ -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}"
Expand All @@ -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.