diff --git a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start index 295d5173fc..455fbf7a5e 100755 --- a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start +++ b/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 & diff --git a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.stop b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.stop index 2a45c6f384..282f21faa9 100755 --- a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.stop +++ b/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 diff --git a/packages/addons/service/downloadmanager/transmission/source/resources/language/English/strings.xml b/packages/addons/service/downloadmanager/transmission/source/resources/language/English/strings.xml index 8f0dd87c49..d5ff333d26 100644 --- a/packages/addons/service/downloadmanager/transmission/source/resources/language/English/strings.xml +++ b/packages/addons/service/downloadmanager/transmission/source/resources/language/English/strings.xml @@ -16,5 +16,6 @@ Other Download Directory + Enable uTP support diff --git a/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml b/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml index 4149778c6f..9caf209ad7 100644 --- a/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml +++ b/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml @@ -21,5 +21,6 @@ + diff --git a/packages/addons/service/downloadmanager/transmission/source/settings-default.xml b/packages/addons/service/downloadmanager/transmission/source/settings-default.xml index ab23f3521f..c3de30f8e6 100644 --- a/packages/addons/service/downloadmanager/transmission/source/settings-default.xml +++ b/packages/addons/service/downloadmanager/transmission/source/settings-default.xml @@ -6,4 +6,5 @@ + diff --git a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.stop b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.stop index c807be4b96..4cee53ecc3 100755 --- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.stop +++ b/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 diff --git a/packages/sysutils/busybox/init.d/07_sysctl b/packages/sysutils/busybox/init.d/07_sysctl index fc34f29e80..1a4452e0df 100644 --- a/packages/sysutils/busybox/init.d/07_sysctl +++ b/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