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

packages/addons/service/downloadmanager/transmission/source/bin/transmission.start

@@ -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 &

packages/addons/service/downloadmanager/transmission/source/bin/transmission.stop

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

packages/addons/service/downloadmanager/transmission/source/resources/language/English/strings.xml

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

packages/addons/service/downloadmanager/transmission/source/resources/settings.xml

@@ -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>

packages/addons/service/downloadmanager/transmission/source/settings-default.xml

@@ -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>

packages/addons/service/multimedia/vdr-addon/source/bin/vdr.stop

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

packages/sysutils/busybox/init.d/07_sysctl

@@ -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