From 2cce710984eb1faef099817936a2ff2b7a33eacb Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 5 Jan 2020 11:45:33 +0200 Subject: [PATCH] transmission: fix directory creation in init script Things were done in the wrong order, leading to config_dir not being chown'ed and subdirectories not being created in case of download_dir being inside config_dir. Fixes: 609109fa9 ("transmission: add seccomp filter and improve jail") Reported-by: Rosen Penev Signed-off-by: Daniel Golle --- net/transmission/files/transmission.init | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/net/transmission/files/transmission.init b/net/transmission/files/transmission.init index dc2038729..f63beade4 100644 --- a/net/transmission/files/transmission.init +++ b/net/transmission/files/transmission.init @@ -73,18 +73,6 @@ transmission() { USE=$((MEM * mem_percentage * 10)) fi - [ -d "$download_dir" ] || { - mkdir -p "$download_dir" - chmod 0755 "$download_dir" - [ -z "$user" ] || chown -R "$user:$group" "$download_dir" - } - - [ "$incomplete_dir_enabled" = "0" ] || [ -d "$incomplete_dir" ] || { - mkdir -p "$incomplete_dir" - chmod 0755 "$incomplete_dir" - [ -z "$user" ] || chown -R "$user:$group" "$incomplete_dir" - } - config_file="$config_dir/settings.json" [ -d "$config_dir" ] || { mkdir -p "$config_dir" @@ -97,6 +85,18 @@ transmission() { [ -z "$user" ] || chown -R "$user:$group" "$config_dir" } + [ -d "$download_dir" ] || { + mkdir -p "$download_dir" + chmod 0755 "$download_dir" + [ -z "$user" ] || chown -R "$user:$group" "$download_dir" + } + + [ "$incomplete_dir_enabled" = "0" ] || [ -d "$incomplete_dir" ] || { + mkdir -p "$incomplete_dir" + chmod 0755 "$incomplete_dir" + [ -z "$user" ] || chown -R "$user:$group" "$incomplete_dir" + } + [ "$config_overwrite" = 0 ] || { echo "{" > "$config_file"