diff options
Diffstat (limited to 'meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm')
-rwxr-xr-x | meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm | 10 |
1 files changed, 6 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 bfa0a8d6cb..6c548551b8 100755 --- a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm | |||
@@ -26,10 +26,11 @@ done | |||
26 | case "$1" in | 26 | case "$1" in |
27 | start) | 27 | start) |
28 | . /etc/profile | 28 | . /etc/profile |
29 | username=root | 29 | |
30 | #default for USER | ||
31 | . /etc/default/xserver-nodm | ||
30 | echo "Starting Xserver" | 32 | echo "Starting Xserver" |
31 | if [ -f /etc/X11/Xusername ]; then | 33 | if [ "$USER" != "root" ]; then |
32 | username=`cat /etc/X11/Xusername` | ||
33 | # setting for rootless X | 34 | # setting for rootless X |
34 | chmod o+w /var/log | 35 | chmod o+w /var/log |
35 | chmod g+r /dev/tty[0-3] | 36 | chmod g+r /dev/tty[0-3] |
@@ -38,8 +39,9 @@ case "$1" in | |||
38 | chmod o+rw /dev/hidraw* | 39 | chmod o+rw /dev/hidraw* |
39 | fi | 40 | fi |
40 | fi | 41 | fi |
42 | |||
41 | # Using su rather than sudo as latest 1.8.1 cause failure [YOCTO #1211] | 43 | # Using su rather than sudo as latest 1.8.1 cause failure [YOCTO #1211] |
42 | su -l -c '/etc/X11/Xserver&' $username | 44 | su -l -c '/etc/xserver-nodm/Xserver &' $USER |
43 | # Wait for the desktop to say its finished loading | 45 | # Wait for the desktop to say its finished loading |
44 | # before loading the rest of the system | 46 | # before loading the rest of the system |
45 | # dbus-wait org.matchbox_project.desktop Loaded | 47 | # dbus-wait org.matchbox_project.desktop Loaded |