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

This commit is contained in:
Stephan Raue 2013-06-13 13:57:10 +02:00
commit 54bdc35246
3 changed files with 3 additions and 3 deletions

View File

@ -31,7 +31,7 @@ case "$1" in
progress "Shutting down HDHomeRun driver for suspending..." progress "Shutting down HDHomeRun driver for suspending..."
mkdir -p "$LOCKDIR" mkdir -p "$LOCKDIR"
touch "$LOCKFILE" touch "$LOCKFILE"
killall userhdhomerun killall -9 userhdhomerun
fi fi
;; ;;

View File

@ -31,7 +31,7 @@ case "$1" in
progress "Shutting down Sundtek DVB driver for suspending..." progress "Shutting down Sundtek DVB driver for suspending..."
mkdir -p "$LOCKDIR" mkdir -p "$LOCKDIR"
touch "$LOCKFILE" touch "$LOCKFILE"
mediaclient --shutdown killall -9 mediasrv
fi fi
;; ;;

View File

@ -25,7 +25,7 @@ wait_for_inet_addr () {
if [ "$WAIT_NETWORK" = "true" ] ; then if [ "$WAIT_NETWORK" = "true" ] ; then
progress "Wait for network" progress "Wait for network"
[ -z "$WAIT_NETWORK_TIME" ] && WAIT_NETWORK_TIME=10 [ -z "$WAIT_NETWORK_TIME" ] && WAIT_NETWORK_TIME=10
LOOP_COUNT=$[$WAIT_NETWORK_TIME * 5] LOOP_COUNT=$((WAIT_NETWORK_TIME * 5))
for i in $(seq 1 $LOOP_COUNT) ; do for i in $(seq 1 $LOOP_COUNT) ; do
cnt=$(ifconfig | sed -e '/inet addr:/!d' -e '/127.0.0.1/d' |wc -l) cnt=$(ifconfig | sed -e '/inet addr:/!d' -e '/127.0.0.1/d' |wc -l)
[ $cnt -gt 0 ] && break [ $cnt -gt 0 ] && break