Sync from GitHub

DDS-Derek · Dec 19, 2024 · 7279fe2 · 7279fe2
1 parent 826f120
commit 7279fe2
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/xy_install.sh b/xy_install.sh
@@ -2017,6 +2017,9 @@ fix_docker() {
     if [ -f /etc/synoinfo.conf ]; then
         DOCKER_ROOT_DIR=$(docker info 2>/dev/null | grep 'Docker Root Dir' | awk -F': ' '{print $2}')
         DOCKER_CONFIG_FILE="${DOCKER_ROOT_DIR%/@docker}/@appconf/ContainerManager/dockerd.json"
+    elif grep -q 'NAME="iStoreOS"' /etc/os-release; then
+        DOCKER_CONFIG_FILE=$(ps w | grep dockerd | awk '{for(i=1;i<=NF;i++) if ($i ~ /^--config-file(=|$)/) {if ($i ~ /^--config-file=/) print substr($i, index($i, "=") + 1); else print $(i+1)}}')
+        DOCKER_CONFIG_FILE=${DOCKER_CONFIG_FILE:-/etc/docker/daemon.json}
     else
         DOCKER_CONFIG_FILE='/etc/docker/daemon.json'
     fi
@@ -2047,7 +2050,6 @@ fix_docker() {
         exit 0
     fi
 
-
     docker_pid
 
     docker rmi hello-world:latest >/dev/null 2>&1