Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

This commit is contained in:
Stephan Raue 2013-01-16 00:30:17 +01:00
commit 8f1586b758
3 changed files with 13 additions and 1 deletions

View File

@ -25,4 +25,10 @@ LOCKFILE="xbmc.disabled"
touch "$LOCKDIR/$LOCKFILE"
wait_on_xbmc_exit
killall sshd
killall5 -15
for seq in `seq 1 10` ; do
usleep 500000
clear > /dev/tty1
killall5 -18 || break
done
reboot

View File

@ -25,4 +25,10 @@ LOCKFILE="xbmc.disabled"
touch "$LOCKDIR/$LOCKFILE"
wait_on_xbmc_exit
killall sshd
killall5 -15
for seq in `seq 1 10` ; do
usleep 500000
clear > /dev/tty1
killall5 -18 || break
done
poweroff

View File

@ -896,7 +896,7 @@ CONFIG_FREE=y
CONFIG_FUSER=y
CONFIG_KILL=y
CONFIG_KILLALL=y
# CONFIG_KILLALL5 is not set
CONFIG_KILLALL5=y
# CONFIG_PGREP is not set
CONFIG_PIDOF=y
# CONFIG_FEATURE_PIDOF_SINGLE is not set