Skip to content

K
k3s
Commit 5ad76043 authored by Brad Davidson's avatar Brad Davidson Committed by Brad Davidson
Browse files
Options

Replace unmount read loop with awk

Signed-off-by: 's avatarBrad Davidson <brad.davidson@rancher.com>
parent 041f18f6
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 24 deletions
install.sh
View file @ 5ad76043
...@@ -546,18 +546,7 @@ getshims() { ...@@ -546,18 +546,7 @@ getshims() {
killtree $({ set +x; } 2>/dev/null; getshims; set -x) killtree $({ set +x; } 2>/dev/null; getshims; set -x)
do_unmount() { do_unmount() {
{ set +x; } 2>/dev/null awk -v path="$1" '$2 ~ ("^" path) { print $2 }' /proc/self/mounts | sort -r | xargs -r -t -n 1 umount
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
} }
do_unmount '/run/k3s' do_unmount '/run/k3s'
......
package/rpm/install.sh
View file @ 5ad76043
...@@ -546,18 +546,7 @@ getshims() { ...@@ -546,18 +546,7 @@ getshims() {
killtree $({ set +x; } 2>/dev/null; getshims; set -x) killtree $({ set +x; } 2>/dev/null; getshims; set -x)
do_unmount() { do_unmount() {
{ set +x; } 2>/dev/null awk -v path="$1" '$2 ~ ("^" path) { print $2 }' /proc/self/mounts | sort -r | xargs -r -t -n 1 umount
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
} }
do_unmount '/run/k3s' do_unmount '/run/k3s'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment