vdr & tvheadend: forgot to rework WAIT_FOR_FEINIT

This commit is contained in:
Stefan Saraev 2013-12-19 15:30:27 +02:00
parent f2d33d9d43
commit 4827c9a87e
2 changed files with 16 additions and 6 deletions

View File

@ -94,9 +94,13 @@ done
# (wait for) at least 1 adapter (xbmc allows to set 0) # (wait for) at least 1 adapter (xbmc allows to set 0)
[ $NUM_ADAPTERS -lt 1 ] && NUM_ADAPTERS=1 [ $NUM_ADAPTERS -lt 1 ] && NUM_ADAPTERS=1
if [ "$WAIT_FOR_FEINIT" == "true" ] && [ ! -e /dev/dvb/adapter$((NUM_ADAPTERS-1))/frontend* ] ; then if [ "$WAIT_FOR_FEINIT" == "true" ] ; then
while [ true ] ; do
if [ -e /dev/dvb/adapter$((NUM_ADAPTERS-1))/frontend* ] ; then
break
fi
sleep 1 sleep 1
continue done
fi fi
if [ "$PRELOAD_CAPMT_CA" == "true" ] ; then if [ "$PRELOAD_CAPMT_CA" == "true" ] ; then

View File

@ -161,12 +161,18 @@ for driver_dvb in $(find /storage/.xbmc/addons/driver.dvb.*/bin/userspace-driver
# use ". " because of variable export # use ". " because of variable export
. $driver_dvb . $driver_dvb
done done
# (wait for) at least 1 adapter (xbmc allows to set 0) # (wait for) at least 1 adapter (xbmc allows to set 0)
[ $NUM_ADAPTERS -lt 1 ] && NUM_ADAPTERS=1 [ $NUM_ADAPTERS -lt 1 ] && NUM_ADAPTERS=1
if [ "$WAIT_FOR_FEINIT" == "true" ] && [ ! -e /dev/dvb/adapter$((NUM_ADAPTERS-1))/frontend* ] ; then if [ "$WAIT_FOR_FEINIT" == "true" ] ; then
while [ true ] ; do
if [ -e /dev/dvb/adapter$((NUM_ADAPTERS-1))/frontend* ] ; then
break
fi
sleep 1 sleep 1
continue done
fi fi
check_tmpfs_mount check_tmpfs_mount
fix_config fix_config
eval LANG=en_US.UTF-8 exec vdr.bin $VDR_ARG &>$LOG_FILE eval LANG=en_US.UTF-8 exec vdr.bin $VDR_ARG &>$LOG_FILE