Add a change for killall to not unmount server and agent directory

Signed-off-by: Vitor Savian <[email protected]> Add recursive search and deletion of unmounted/mounted dirs in killall Signed-off-by: Vitor Savian <[email protected]> Only clean the server and agent directory if it is uninstall Signed-off-by: Vitor Savian <[email protected]>
k3s-io · Jul 12, 2024 · 9a0c31f · 9a0c31f
1 parent 58ab259
commit 9a0c31f
Showing 1 changed file with 20 additions and 1 deletion.
diff --git a/install.sh b/install.sh
@@ -902,10 +902,29 @@ for cmd in kubectl crictl ctr; do
     fi
 done
 
+clean_mounted_directory() {
+    if ! grep -q " \$1" /proc/mounts; then
+        rm -rf "\$1"
+	return 0
+    fi
+
+    for path in "\$1"/*; do
+        if [ -d "\$path" ]; then
+            if grep -q " \$path" /proc/mounts; then
+                clean_mounted_directory "\$path"
+            else
+                rm -rf "\$path"
+            fi
+        else
+            rm "\$path"
+        fi
+     done
+}
+
 rm -rf /etc/rancher/k3s
 rm -rf /run/k3s
 rm -rf /run/flannel
-rm -rf \${K3S_DATA_DIR}
+clean_mounted_directory \${K3S_DATA_DIR}
 rm -rf /var/lib/kubelet
 rm -f ${BIN_DIR}/k3s
 rm -f ${KILLALL_K3S_SH}