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

This commit is contained in:
Stephan Raue 2013-01-16 00:26:33 +01:00
commit 0f8775cc62
7 changed files with 21 additions and 2 deletions

View File

@ -75,6 +75,12 @@ else
TRANSMISSION_ARG="$TRANSMISSION_ARG -T"
fi
if [ "$TRANSMISSION_UTP" = "true" ]; then
TRANSMISSION_ARG="$TRANSMISSION_ARG --utp"
else
TRANSMISSION_ARG="$TRANSMISSION_ARG --no-utp"
fi
if [ ! "$(pidof transmission-daemon)" ];then
if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
rm -rf "$LOCKDIR/$LOCKFILE"
@ -83,6 +89,11 @@ if [ ! "$(pidof transmission-daemon)" ];then
if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
break
fi
# XXX: sysctls for uTP. we may remove this later
if [ "$TRANSMISSION_UTP" = "true" ]; then
sysctl -w net.core.wmem_max=1048576 > /dev/null 2>&1
sysctl -w net.core.rmem_max=4194304 > /dev/null 2>&1
fi
EVENT_NOEPOLL=1 LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" eval transmission-daemon -f $TRANSMISSION_ARG &>$LOG_FILE
sleep 1
done &

View File

@ -29,5 +29,5 @@ mkdir -p "$LOCKDIR"
touch "$LOCKDIR/$LOCKFILE"
if [ "$(pidof transmission-daemon)" ];then
killall -9 transmission-daemon
killall transmission-daemon
fi

View File

@ -16,5 +16,6 @@
<string id="3110">Other</string>
<string id="3121">Download Directory</string>
<string id="3122">Enable uTP support</string>
</strings>

View File

@ -21,5 +21,6 @@
<setting type="sep" />
<setting label="3110" type="lsep"/>
<setting id="TRANSMISSION_DL_DIR" type="folder" label="3121" value="" default="/storage/downloads" />
<setting id="TRANSMISSION_UTP" type="bool" label="3122" default="false" />
</category>
</settings>

View File

@ -6,4 +6,5 @@
<setting id="TRANSMISSION_LIMIT_GLOBAL" value="" />
<setting id="TRANSMISSION_LIMIT_TORRENT" value="" />
<setting id="TRANSMISSION_DL_DIR" value="/storage/downloads" />
<setting id="TRANSMISSION_UTP" value="false" />
</settings>

View File

@ -29,6 +29,6 @@ mkdir -p "$LOCKDIR"
touch "$LOCKDIR/$LOCKFILE"
if [ "$(pidof vdr.bin)" ];then
killall -9 vdr.bin
killall vdr.bin
fi

View File

@ -37,3 +37,8 @@ progress "setup sysctl"
if [ -f /etc/sysctl.conf ]; then
sysctl -p /etc/sysctl.conf > /dev/null 2>&1 &
fi
if [ -f /storage/.config/sysctl.conf ]; then
progress "set sysctls from /storage/.config/sysctl.conf"
sysctl -p /storage/.config/sysctl.conf > /dev/null 2>&1 &
fi