[oe-commits] Martin Jansa : xserver-nodm-init: set USER and HOME

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 7206edddeb3c23d1c0efcce85ceb63d7e896b0c3
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=7206edddeb3c23d1c0efcce85ceb63d7e896b0c3

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Oct 21 17:22:59 2011 +0200

xserver-nodm-init: set USER and HOME

* when it's executed from init then HOME is set to '/'
* shadow/agetty set HOME fine and Xinit is doing the same, but for xinit Xsession it didn't work

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>

---

 .../xserver-nodm-init-2.0/xserver-nodm             |    7 +++++++
 .../xserver-nodm-init/xserver-nodm-init_2.0.bb     |    2 +-
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm
index 39ce890..d2e2f86 100755
--- a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm
+++ b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm
@@ -17,6 +17,13 @@ case "$1" in
     if [ "$2" != "background" ]; then
       $0 $1 background &
     else
+       # work around from /etc/X11/Xinit
+       export USER=root
+       export HOME=/home/root
+       if [ ! -d $HOME ] && [ -d /root ]; then
+         HOME=/root
+       fi
+
        . /etc/profile
 
        echo "Starting Xserver"
diff --git a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb
index 17fe4d8..496b342 100644
--- a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb
+++ b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb
@@ -3,7 +3,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 SECTION = "x11"
 
-PR = "r10"
+PR = "r11"
 
 SRC_URI = "file://xserver-nodm \
            file://xserver-nodm.service \