From 5ad76043acbfc2dc1e972b5c78cce821cf17a40e Mon Sep 17 00:00:00 2001
From: Brad Davidson <brad.davidson@rancher.com>
Date: Thu, 10 Sep 2020 15:44:09 -0700
Subject: [PATCH] Replace unmount read loop with awk

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
---
 install.sh             | 13 +------------
 package/rpm/install.sh | 13 +------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/install.sh b/install.sh
index 51556dea0e..6995e444b4 100755
--- a/install.sh
+++ b/install.sh
@@ -546,18 +546,7 @@ getshims() {
 killtree $({ set +x; } 2>/dev/null; getshims; set -x)
 
 do_unmount() {
-    { set +x; } 2>/dev/null
-    MOUNTS=
-    while read ignore mount ignore; do
-        MOUNTS="$mount\n$MOUNTS"
-    done </proc/self/mounts
-    MOUNTS=$(printf $MOUNTS | grep "^$1" | sort -r)
-    if [ -n "${MOUNTS}" ]; then
-        set -x
-        xargs -n 1 umount <<< ${MOUNTS}
-    else
-        set -x
-    fi
+    awk -v path="$1" '$2 ~ ("^" path) { print $2 }' /proc/self/mounts | sort -r | xargs -r -t -n 1 umount
 }
 
 do_unmount '/run/k3s'
diff --git a/package/rpm/install.sh b/package/rpm/install.sh
index e1342fabd4..8d56e4bb93 100755
--- a/package/rpm/install.sh
+++ b/package/rpm/install.sh
@@ -546,18 +546,7 @@ getshims() {
 killtree $({ set +x; } 2>/dev/null; getshims; set -x)
 
 do_unmount() {
-    { set +x; } 2>/dev/null
-    MOUNTS=
-    while read ignore mount ignore; do
-        MOUNTS="$mount\n$MOUNTS"
-    done </proc/self/mounts
-    MOUNTS=$(printf $MOUNTS | grep "^$1" | sort -r)
-    if [ -n "${MOUNTS}" ]; then
-        set -x
-        xargs -n 1 umount <<< ${MOUNTS}
-    else
-        set -x
-    fi
+    awk -v path="$1" '$2 ~ ("^" path) { print $2 }' /proc/self/mounts | sort -r | xargs -r -t -n 1 umount
 }
 
 do_unmount '/run/k3s'