From b56a384d76c9b0e571b9439188d0788468c39df4 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 14 May 2012 22:45:21 +0300 Subject: [PATCH 1/3] transmission: add an option to specify download directory --- .../transmission/source/bin/transmission.start | 12 ++++++------ .../source/resources/language/English/strings.xml | 3 +++ .../transmission/source/resources/settings.xml | 4 ++++ .../transmission/source/settings-default.xml | 1 + 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start index fed7a28623..295d5173fc 100755 --- a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start +++ b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start @@ -44,17 +44,17 @@ cat "$ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/co . /var/config/transmission.conf.default . /var/config/transmission.conf -mkdir -p /storage/downloads -mkdir -p /storage/downloads/incoming -mkdir -p /storage/downloads/watch +mkdir -p "$TRANSMISSION_DL_DIR" +mkdir -p "$TRANSMISSION_DL_DIR/incoming" +mkdir -p "$TRANSMISSION_DL_DIR/watch" if [ -z "$TRANSMISSION_IP" ]; then TRANSMISSION_IP="*.*.*.*" fi -TRANSMISSION_ARG="$TRANSMISSION_ARG -w /storage/downloads" -TRANSMISSION_ARG="$TRANSMISSION_ARG --incomplete-dir /storage/downloads/incoming" -TRANSMISSION_ARG="$TRANSMISSION_ARG --watch-dir /storage/downloads/watch" +TRANSMISSION_ARG="$TRANSMISSION_ARG -w \"$TRANSMISSION_DL_DIR\"" +TRANSMISSION_ARG="$TRANSMISSION_ARG --incomplete-dir \"$TRANSMISSION_DL_DIR/incoming\"" +TRANSMISSION_ARG="$TRANSMISSION_ARG --watch-dir \"$TRANSMISSION_DL_DIR/watch\"" TRANSMISSION_ARG="$TRANSMISSION_ARG -e /var/log/transmission.log" TRANSMISSION_ARG="$TRANSMISSION_ARG -g /storage/.cache/transmission" 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 03ea679927..8f0dd87c49 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 @@ -14,4 +14,7 @@ Overall peer limit. Peer limit per torrent + Other + Download Directory + diff --git a/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml b/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml index 54940b0307..4149778c6f 100644 --- a/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml +++ b/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml @@ -17,5 +17,9 @@ + + + + diff --git a/packages/addons/service/downloadmanager/transmission/source/settings-default.xml b/packages/addons/service/downloadmanager/transmission/source/settings-default.xml index 1dd12e1785..ab23f3521f 100644 --- a/packages/addons/service/downloadmanager/transmission/source/settings-default.xml +++ b/packages/addons/service/downloadmanager/transmission/source/settings-default.xml @@ -5,4 +5,5 @@ + From 39df09f5e7da3cadbb92f8b49aa1ef1635eefa63 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 14 May 2012 22:46:41 +0300 Subject: [PATCH 2/3] transmission: update changelog --- .../addons/service/downloadmanager/transmission/changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/addons/service/downloadmanager/transmission/changelog.txt b/packages/addons/service/downloadmanager/transmission/changelog.txt index ae91b69488..b683b2d47a 100644 --- a/packages/addons/service/downloadmanager/transmission/changelog.txt +++ b/packages/addons/service/downloadmanager/transmission/changelog.txt @@ -1,5 +1,6 @@ 2.1.3 - update to transmission-2.51 +- added option to specify download directory 2.1.2 - update to addon version 2.1 From 4fc2b8ee965231e6f22dd314527d54a97b3d86fd Mon Sep 17 00:00:00 2001 From: Alain Kalker Date: Tue, 15 May 2012 00:12:38 +0200 Subject: [PATCH 3/3] busybox-initramfs: Skip and warn instead of error on module load failure When a kernel module fails to load, produce a warning instead of an error and skip that module instead of halting the system. Currently uses progress() for the warning, we may need a better alternative. Signed-off-by: Alain Kalker --- packages/initramfs/sysutils/busybox-initramfs/scripts/init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/initramfs/sysutils/busybox-initramfs/scripts/init b/packages/initramfs/sysutils/busybox-initramfs/scripts/init index 7ae551b4cd..b18b6fed64 100755 --- a/packages/initramfs/sysutils/busybox-initramfs/scripts/init +++ b/packages/initramfs/sysutils/busybox-initramfs/scripts/init @@ -319,7 +319,7 @@ NBD_DEVS="0" for module in $(cat /etc/modules); do progress "Loading kernel module $module" /bin/busybox insmod "$MODULE_DIR/$module.ko" || \ - error "load_modules" "Failed to load kernel module $module" + progress "... Failed to load kernel module $module, skipping" done }