From ca6ac886094e753d8ae18bccd0c69dda0a6c306e Mon Sep 17 00:00:00 2001
From: Luke Childs <lukechilds123@gmail.com>
Date: Sat, 24 Apr 2021 01:25:12 +0700
Subject: [PATCH] Don't move docker at ota

---
 scripts/update/01-run.sh | 68 ++++++++++++++++++++--------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/scripts/update/01-run.sh b/scripts/update/01-run.sh
index 1645b5e..67a8a12 100755
--- a/scripts/update/01-run.sh
+++ b/scripts/update/01-run.sh
@@ -123,40 +123,40 @@ cd "$UMBREL_ROOT"
 
 # Move Docker data dir to external storage now if this is an old install.
 # This is only needed temporarily until all users have transitioned Docker to SSD.
-DOCKER_DIR="/var/lib/docker"
-MOUNT_POINT="/mnt/data"
-EXTERNAL_DOCKER_DIR="${MOUNT_POINT}/docker"
-if [[ ! -z "${UMBREL_OS:-}" ]] && [[ ! -d "${EXTERNAL_DOCKER_DIR}" ]]; then
-  echo "Attempting to move Docker to external storage..."
-cat <<EOF > "$UMBREL_ROOT"/statuses/update-status.json
-{"state": "installing", "progress": 72, "description": "Migrating Docker install to external storage", "updateTo": "$RELEASE"}
-EOF
-
-  echo "Stopping Docker service..."
-  systemctl stop docker
-
-  # Copy Docker data dir to external storage
-  copy_docker_to_external_storage () {
-    mkdir -p "${EXTERNAL_DOCKER_DIR}"
-    cp  --recursive \
-        --archive \
-        --no-target-directory \
-        "${DOCKER_DIR}" "${EXTERNAL_DOCKER_DIR}"
-  }
-
-  echo "Copying Docker data directory to external storage..."
-  copy_docker_to_external_storage
-
-  echo "Bind mounting external storage over local Docker data dir..."
-  mount --bind "${EXTERNAL_DOCKER_DIR}" "${DOCKER_DIR}"
-
-  # Ensure fs changes are registered
-  sync
-  sleep 1
-
-  echo "Starting Docker service..."
-  systemctl start docker
-fi
+# DOCKER_DIR="/var/lib/docker"
+# MOUNT_POINT="/mnt/data"
+# EXTERNAL_DOCKER_DIR="${MOUNT_POINT}/docker"
+# if [[ ! -z "${UMBREL_OS:-}" ]] && [[ ! -d "${EXTERNAL_DOCKER_DIR}" ]]; then
+#   echo "Attempting to move Docker to external storage..."
+# cat <<EOF > "$UMBREL_ROOT"/statuses/update-status.json
+# {"state": "installing", "progress": 72, "description": "Migrating Docker install to external storage", "updateTo": "$RELEASE"}
+# EOF
+#
+#   echo "Stopping Docker service..."
+#   systemctl stop docker
+#
+#   # Copy Docker data dir to external storage
+#   copy_docker_to_external_storage () {
+#     mkdir -p "${EXTERNAL_DOCKER_DIR}"
+#     cp  --recursive \
+#         --archive \
+#         --no-target-directory \
+#         "${DOCKER_DIR}" "${EXTERNAL_DOCKER_DIR}"
+#   }
+#
+#   echo "Copying Docker data directory to external storage..."
+#   copy_docker_to_external_storage
+#
+#   echo "Bind mounting external storage over local Docker data dir..."
+#   mount --bind "${EXTERNAL_DOCKER_DIR}" "${DOCKER_DIR}"
+#
+#   # Ensure fs changes are registered
+#   sync
+#   sleep 1
+#
+#   echo "Starting Docker service..."
+#   systemctl start docker
+# fi
 
 # Overlay home dir structure with new dir tree
 echo "Overlaying $UMBREL_ROOT/ with new directory tree"