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

This commit is contained in:
Stephan Raue 2013-03-22 20:05:44 +01:00
commit 2b840b1dd5
2 changed files with 14 additions and 3 deletions

View File

@ -39,9 +39,9 @@ fi
# starting autostart script (will be removed later again, dont use it!!!)
AUTOSTART="/storage/.config/autostart.sh"
if [ -f $AUTOSTART ]; then
echo "!!! AUTOSTART script detected !!!" >> /var/log/messages
cat "$AUTOSTART" >> /var/log/messages
echo "!!! -End of autostart script- !!!" >> /var/log/messages
echo '!!! AUTOSTART script detected !!!' | logger -t Boot
cat "$AUTOSTART" | logger -t Boot
echo '!!! -End of autostart script- !!!' | logger -t Boot
sh $AUTOSTART
fi

View File

@ -27,7 +27,18 @@
omit_pids+=( $@ )
}
_shutdown_script () {
SHUTDOWN="/storage/.config/shutdown.sh"
if [ -f $SHUTDOWN ]; then
echo '!!! SHUTDOWN script detected !!!' | logger -t shutdown.sh
cat "$SHUTDOWN" | logger -t shutdown.sh
echo '!!! -End of shutdown script- !!!' | logger -t shutdown.sh
sh $SHUTDOWN
fi
}
_safe_shutdown () {
_shutdown_script
add_omit_pids $(pidof connmand)
add_omit_pids $(pidof dbus-daemon)
killall5 -15 ${omit_pids[@]/#/-o }