From 11c294f4e11cca59b61899d77ec280294c6cd1e1 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 14 Jan 2013 22:38:37 +0200 Subject: [PATCH 1/5] busybox: init: support for custom sysctl.conf file in /storage/.config/ --- packages/sysutils/busybox/init.d/07_sysctl | 5 +++++ 1 file changed, 5 insertions(+) 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 From 0b3c1a4e6730b9884a1682cd503ca270dc0d02df Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 14 Jan 2013 23:08:11 +0200 Subject: [PATCH 2/5] transmission: uTP is now disabled by default. add option to enable it. --- .../transmission/source/bin/transmission.start | 6 ++++++ .../source/resources/language/English/strings.xml | 1 + .../transmission/source/resources/settings.xml | 1 + .../transmission/source/settings-default.xml | 1 + 4 files changed, 9 insertions(+) diff --git a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start index 295d5173fc..d024063421 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" 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 @@ + From 2cf0e0be30ebd6f6e73f1fb78adc897f1cb3ecd4 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 14 Jan 2013 23:09:13 +0200 Subject: [PATCH 3/5] transmission: net.core.{r,w}mem.max *workaround for uTP --- .../transmission/source/bin/transmission.start | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start index d024063421..455fbf7a5e 100755 --- a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start +++ b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start @@ -89,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 & From db4575ea0a89c0a17b91c2b6e0a2d09419acada5 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 14 Jan 2013 23:13:55 +0200 Subject: [PATCH 4/5] vdr: vdr.stop: send TERM signal, not KILL --- .../addons/service/multimedia/vdr-addon/source/bin/vdr.stop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From f1498606d7aef68eda620cc48afad65608a80504 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Tue, 15 Jan 2013 00:11:28 +0200 Subject: [PATCH 5/5] transmission: transmission.stop: send TERM signal, not KILL --- .../downloadmanager/transmission/source/bin/transmission.stop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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