[oe-commits] Sebastian Krzyszkowiak : shr-image: add fix for overwriting DISPLAY variable when using X forwarding

[git version control]

Module: openembedded.git
Branch: shr/import
Commit: 1dd0704c26df3a014c92454687e719723bd196d1
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=1dd0704c26df3a014c92454687e719723bd196d1

Author: Sebastian Krzyszkowiak <seba.dos1 at gmail.com>
Date:   Sat Aug 15 19:37:31 2009 +0000

shr-image: add fix for overwriting DISPLAY variable when using X forwarding

---

 recipes/images/shr-image.inc |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/recipes/images/shr-image.inc b/recipes/images/shr-image.inc
index e4358f7..89b3a8f 100644
--- a/recipes/images/shr-image.inc
+++ b/recipes/images/shr-image.inc
@@ -40,7 +40,7 @@ inherit image
 
 # perform some SHR convenience tweaks to the rootfs
 shr_rootfs_postprocess() {
-    dirs=`find ${FILESDIR} -type d -printf "%P\n" | grep -v "^.$" | grep -v ".git" | grep -v "^./patches$"`
+    dirs=`find ${FILESDIR} -type d -printf "%P\n" | grep -v "^.$" | grep -v ".git"`
     for dir in $dirs; do
         mkdir -p ${IMAGE_ROOTFS}/$dir
     done
@@ -100,7 +100,10 @@ shr_rootfs_postprocess() {
     echo "ppp_generic" > ./etc/modutils/ppp_generic
 
     #set up some variables to improve default settings
-    echo "export DISPLAY=localhost:0" >> ./etc/profile
+    echo "if [ \"$DISPLAY\" = \"\" ]" >> ./etc/profile
+    echo "then" >> ./etc/profile
+    echo "    export DISPLAY=localhost:0" >> ./etc/profile
+    echo "fi" >> ./etc/profile
     echo "export HISTFILESIZE=1000" >> ./etc/profile
     echo "export HISTSIZE=1000" >> ./etc/profile
     echo "alias rm='rm -i'; alias cp='cp -i'; alias mv='mv -i'" >> ./etc/profile