From a9b9a12ea36edde94c71acdd1b19d68336199efa Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 14 Dec 2016 00:10:22 -0500 Subject: [PATCH 1/4] enable ownership check on /config --- root/etc/cont-init.d/40-chown-files | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/root/etc/cont-init.d/40-chown-files b/root/etc/cont-init.d/40-chown-files index 8579706..3fa19bc 100644 --- a/root/etc/cont-init.d/40-chown-files +++ b/root/etc/cont-init.d/40-chown-files @@ -1,23 +1,16 @@ #!/usr/bin/with-contenv bash -# check for preferences file, make lock file if not found and exit out +# check for preferences file and if not found, exit out if [ ! -e "/config/Library/Application Support/Plex Media Server/Preferences.xml" ]; then -mkdir -p /config/Library -touch /config/Library/linuxserver-chown.lock -chown abc:abc \ + mkdir -p /config/Library + chown abc:abc \ /config/Library -chown abc:abc \ - /config/Library/linuxserver-chown.lock -exit 0 + exit 0 fi -if [ ! -f "/config/Library/linuxserver-chown.lock" ]; then -echo "Possible migration from existing version detected, please be patient while we chown existing files" -echo "This could take some time" -chown abc:abc -R \ +if [ ! `stat -c %U /config/Library` = "abc" ]; then + echo "Change in ownership detected, please be patient while we chown existing files" + echo "This could take some time" + chown abc:abc -R \ /config/Library -touch /config/Library/linuxserver-chown.lock -chown abc:abc \ - /config/Library/linuxserver-chown.lock -echo "chown operation completed" fi From c2f1a2ab1bb35d238a0e595e926e9318809abee9 Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 14 Dec 2016 00:21:01 -0500 Subject: [PATCH 2/4] friggin' lint checker :-P --- root/etc/cont-init.d/40-chown-files | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/cont-init.d/40-chown-files b/root/etc/cont-init.d/40-chown-files index 3fa19bc..b8bb32b 100644 --- a/root/etc/cont-init.d/40-chown-files +++ b/root/etc/cont-init.d/40-chown-files @@ -8,7 +8,7 @@ if [ ! -e "/config/Library/Application Support/Plex Media Server/Preferences.xml exit 0 fi -if [ ! `stat -c %U /config/Library` = "abc" ]; then +if [ ! "$(stat -c %U /config/Library)" = "abc" ]; then echo "Change in ownership detected, please be patient while we chown existing files" echo "This could take some time" chown abc:abc -R \ From ac7bb65f5f4fdd659eed45ce8662275bd19f8d86 Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 14 Dec 2016 00:29:48 -0500 Subject: [PATCH 3/4] use uid instead of id, because there can be multiple ids tied to same uid --- root/etc/cont-init.d/40-chown-files | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/cont-init.d/40-chown-files b/root/etc/cont-init.d/40-chown-files index b8bb32b..efe7e57 100644 --- a/root/etc/cont-init.d/40-chown-files +++ b/root/etc/cont-init.d/40-chown-files @@ -8,7 +8,7 @@ if [ ! -e "/config/Library/Application Support/Plex Media Server/Preferences.xml exit 0 fi -if [ ! "$(stat -c %U /config/Library)" = "abc" ]; then +if [ ! "$(stat -c %u /config/Library)" = "$PUID" ]; then echo "Change in ownership detected, please be patient while we chown existing files" echo "This could take some time" chown abc:abc -R \ From 8c4bcb733a66a5c51cd15260a5fbd138103edbe1 Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 14 Dec 2016 14:45:38 -0500 Subject: [PATCH 4/4] Condense the ownership check --- root/etc/cont-init.d/40-chown-files | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/root/etc/cont-init.d/40-chown-files b/root/etc/cont-init.d/40-chown-files index efe7e57..fa3c826 100644 --- a/root/etc/cont-init.d/40-chown-files +++ b/root/etc/cont-init.d/40-chown-files @@ -1,14 +1,10 @@ #!/usr/bin/with-contenv bash -# check for preferences file and if not found, exit out -if [ ! -e "/config/Library/Application Support/Plex Media Server/Preferences.xml" ]; then +# check for Library existence and permissions +if [ ! -d "/config/Library" ]; then mkdir -p /config/Library - chown abc:abc \ - /config/Library - exit 0 -fi - -if [ ! "$(stat -c %u /config/Library)" = "$PUID" ]; then + chown abc:abc /config/Library +elif [ ! "$(stat -c %u /config/Library)" = "$PUID" ]; then echo "Change in ownership detected, please be patient while we chown existing files" echo "This could take some time" chown abc:abc -R \