summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSung-Jin Park <sj76.park@samsung.com>2013-05-23 06:18:11 -0400
committerBoram Park <boram1288.park@samsung.com>2013-09-02 17:05:04 +0900
commit9fa1b446ba2dfb65c0ba2d45b5c0244d05405cba (patch)
tree11b2a39e49ee0529ec5ce4dbf0729378b878f798
parentce7b2e5d941aaea3705ade4bf3e09a405ad43e63 (diff)
downloadxf86-misc-exynos4412-9fa1b446ba2dfb65c0ba2d45b5c0244d05405cba.tar.gz
xf86-misc-exynos4412-9fa1b446ba2dfb65c0ba2d45b5c0244d05405cba.tar.bz2
xf86-misc-exynos4412-9fa1b446ba2dfb65c0ba2d45b5c0244d05405cba.zip
Modify startx.in and xinitrc to export ENV variables for launching wm in xinit
Change-Id: Ibdbef8074405f9f23d2940887d64a5f0261fb8ce
-rwxr-xr-xarm-common/startx.in6
-rwxr-xr-xarm-common/xinitrc14
2 files changed, 6 insertions, 14 deletions
diff --git a/arm-common/startx.in b/arm-common/startx.in
index f3bf9c6..0cd15fd 100755
--- a/arm-common/startx.in
+++ b/arm-common/startx.in
@@ -36,6 +36,12 @@ else
Xorg ${XSERVER_OPTIONS} &
else
+ export WMRC=/etc/X11/wmrc
+ export WMUSERID=`id -u app`
+ export WMGROUPID=`id -g app`
+ export WMUSER=app
+ export WMUSERHOME=/opt/home/app
+
xinit ${XINITRC} -- @PREFIX@/bin/Xorg ${XSERVER_OPTIONS} &
fi
fi
diff --git a/arm-common/xinitrc b/arm-common/xinitrc
index ce851e6..f2060e1 100755
--- a/arm-common/xinitrc
+++ b/arm-common/xinitrc
@@ -11,17 +11,3 @@ if [ -x /usr/bin/xrdb ]; then
fi
fi
-# Copy .e directory if not exist
-export HOME=/opt/home/app
-
-if [ ! -d ${HOME}/.e ]; then
- cp -rf /opt/home/root/.e ${HOME}/.e
- chown -R app:app ${HOME}/.e
-fi
-
-E17_USER=`id -u app`
-E17_GROUP=`id -g app`
-HOME=/opt/home/app USER=app EVAS_NO_DRI_SWAPBUF=1 /usr/bin/enlightenment_start -profile samsung -i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it -user ${E17_USER} -group ${E17_GROUP} &
-
-#su -c "HOME=/opt/home/app /usr/bin/enlightenment_start -profile samsung -i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it &" -l app
-