Merge pull request #366 from stefansaraev/tvheadend

tvheadend: add an option to wait for fe initialization
This commit is contained in:
Stephan Raue 2012-03-25 06:37:28 -07:00
commit 97da95def9
4 changed files with 15 additions and 0 deletions

View File

@ -1,4 +1,5 @@
<settings> <settings>
<setting id="WAIT_FOR_FEINIT" value="false" />
<setting id="XMLTV_LOCATION_FILE" value="" /> <setting id="XMLTV_LOCATION_FILE" value="" />
<setting id="XMLTV_LOCATION_WEB" value="http://" /> <setting id="XMLTV_LOCATION_WEB" value="http://" />
<setting id="XMLTV_TYPE" value="NONE" /> <setting id="XMLTV_TYPE" value="NONE" />

View File

@ -54,6 +54,14 @@ fi
TVHEADEND_ARG="-C -s -u root -g video -c $ADDON_HOME" TVHEADEND_ARG="-C -s -u root -g video -c $ADDON_HOME"
mkdir -p /var/config
cat "$ADDON_DIR/settings-default.xml" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/tvheadend.conf.default
cat "$ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/tvheadend.conf
. /var/config/tvheadend.conf.default
. /var/config/tvheadend.conf
mkdir -p $ADDON_HOME mkdir -p $ADDON_HOME
if [ ! "$(pidof $ADDON_BIN)" ]; then if [ ! "$(pidof $ADDON_BIN)" ]; then
# start userspace DVB driver/addon # start userspace DVB driver/addon
@ -72,6 +80,10 @@ mkdir -p $ADDON_HOME
if [ -f "$LOCKDIR/$LOCKFILE" ] ; then if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
break break
fi fi
if [ "$WAIT_FOR_FEINIT" == "true" ] && [ ! -e /dev/dvb/adapter*/frontend* ] ; then
sleep 1
continue
fi
$ADDON_BIN $TVHEADEND_ARG &>$LOG_FILE $ADDON_BIN $TVHEADEND_ARG &>$LOG_FILE
done & done &
fi fi

View File

@ -10,5 +10,6 @@
<string id="1013">XMLTV Web location</string> <string id="1013">XMLTV Web location</string>
<string id="1020">DVB Configuration</string> <string id="1020">DVB Configuration</string>
<string id="1021">Unload DVB mudules before suspend</string> <string id="1021">Unload DVB mudules before suspend</string>
<string id="1022">Wait for frontend initialization</string>
</strings> </strings>

View File

@ -12,6 +12,7 @@
<category label="1001"> <category label="1001">
<setting label="1020" type="lsep"/> <setting label="1020" type="lsep"/>
<setting type="sep" /> <setting type="sep" />
<setting id="WAIT_FOR_FEINIT" type="bool" label="1022" default="false" />
<setting id="REMOVE_MODULES" type="text" label="1021" values="" default=""/> <setting id="REMOVE_MODULES" type="text" label="1021" values="" default=""/>
</category> </category>
</settings> </settings>