8294f427d0
In the event the xserver fails to start the dbus-wait has to time out and this causes many users a lot of confusion. If we wish to reinstate this, we need to find a safer mechanism to do it where X failing to start cancels the timeout (sends a dbus event at that point?) The comments are left in the file as an example in case some user does wish to enable is. (From OE-Core rev: 0471b17b061e57231387ef90c95fc0c34fc0e66b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
1.3 KiB
Executable File
#!/bin/sh
BEGIN INIT INFO
Provides: xserver
Required-Start: $local_fs $remote_fs dbus
Required-Stop: $local_fs $remote_fs
Default-Start: 2 3 4 5
Default-Stop: 0 1 6
END INIT INFO
killproc() { # kill the named process(es)
pid=/bin/pidof $1
[ "$pid" != "" ] && kill $pid
}
read CMDLINE < /proc/cmdline for x in $CMDLINE; do case $x in x11=false) echo "X Server disabled" exit 0; ;; esac done
case "$1" in
start)
. /etc/profile
username=root
echo "Starting Xserver"
if [ -f /etc/X11/Xusername ]; then
username=cat /etc/X11/Xusername
# setting for rootless X
chmod o+w /var/log
chmod g+r /dev/tty[0-3]
chmod o+rw /dev/input/*
fi
# Using su rather than sudo as latest 1.8.1 cause failure [YOCTO #1211]
su -l -c '/etc/X11/Xserver&' $username
# Wait for the desktop to say its finished loading
# before loading the rest of the system
# dbus-wait org.matchbox_project.desktop Loaded
;;
stop) echo "Stopping XServer" killproc xinit ;;
restart) $0 stop sleep 1 $0 start ;;
*) echo "usage: $0 { start | stop | restart }" ;; esac
exit 0