summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2011-08-02 07:24:00 (GMT)
committerSaul Wold <sgw@linux.intel.com>2011-08-04 16:10:30 (GMT)
commitf783f74e39f410af854344d5fe337cd0fc30e052 (patch)
tree185ca5945a49d8879d77b8e501f9b93f7b20f297
parente0ea56a6b33662dbbe542c77cde2524c1d1ec197 (diff)
downloadpoky-f783f74e39f410af854344d5fe337cd0fc30e052.tar.gz
xserver-nodm-init: Fix X start failure on some platform
sudo is used to run rootless X in xserver-nodm, and start to fail with "xf86OpenConsole: Cannot open /dev/tty0" error after upgrade to 1.8.1. sudo seems wait for some resource that is unavailable in early phase of booting. This patch swith to "su" for rootless X starting as a fix. [YOCTO #1211] got fixed (From OE-Core rev: cb935833a128d67e6c1fbe745cf68a58df6470d1) Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xmeta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm6
1 files changed, 2 insertions, 4 deletions
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
index d8c4ba0..3b71983 100755
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
@@ -35,10 +35,8 @@ case "$1" in
35 chmod g+r /dev/tty[0-3] 35 chmod g+r /dev/tty[0-3]
36 chmod o+rw /dev/input/* 36 chmod o+rw /dev/input/*
37 fi 37 fi
38 # Using sudo -i here has the nice side effect of making sire 38 # Using su rather than sudo as latest 1.8.1 cause failure [YOCTO #1211]
39 # HOME, USER and other previously problematic variables 39 su -l -c '/etc/X11/Xserver&' $username
40 # are set correctly
41 sudo -b -i -u $username /etc/X11/Xserver
42 # Wait for the desktop to say its finished loading 40 # Wait for the desktop to say its finished loading
43 dbus-wait org.matchbox_project.desktop Loaded 41 dbus-wait org.matchbox_project.desktop Loaded
44 ;; 42 ;;