summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Xu (Hello71) <alex_y_xu@yahoo.ca>2021-06-30 12:33:37 -0400
committerAlex Xu (Hello71) <alex_y_xu@yahoo.ca>2021-06-30 12:33:37 -0400
commit4cd8f41bed948d3d8e19cbe1c346e6a77c0e148b (patch)
tree3e4e73a1079a722bfe024422d5feb8579c134092
parentd571da78eaaa8408b4a6be8d8945df93624f41a9 (diff)
downloadtmpoverlay-4cd8f41bed948d3d8e19cbe1c346e6a77c0e148b.tar.xz
tmpoverlay-4cd8f41bed948d3d8e19cbe1c346e6a77c0e148b.zip
fix shellcheck, remove userns supportHEADmaster
need idmap to do properly
-rwxr-xr-xtmpoverlay.sh11
1 files changed, 3 insertions, 8 deletions
diff --git a/tmpoverlay.sh b/tmpoverlay.sh
index 9ca2d00..4ea61f8 100755
--- a/tmpoverlay.sh
+++ b/tmpoverlay.sh
@@ -30,6 +30,7 @@ EOF
log() {
# not equivalent to printf "tmpoverlay: $@"
printf 'tmpoverlay: ' >&2
+ # shellcheck disable=SC2059
printf "$@" >&2
printf '\n' >&2
}
@@ -134,7 +135,7 @@ cmd mkfifo "$tmpdir/fifo" || { cmd umount "$tmpdir"; cmd rmdir "$tmpdir"; die; }
trap '' INT || die
exec <fifo || die
# read returns non-zero when write end is closed
- read _
+ read -r _
logv 'unmounting tmpdir'
# TODO: this *almost* works except umount insists on canonicalizing .
# shellcheck disable=SC2086
@@ -214,13 +215,7 @@ owner=$(printf '%s\n' "$ls" | sed -e 's/^[^ ]* [^ ]* \([^ ]*\) \([^ ]*\).*$/\1:\
[ -n "$owner" ] || die 'bad ls owner output'
mode=$(printf '%s\n' "$ls" | sed -e 's/^d\(...\)\(...\)\(...\).*/u=\1,g=\2,o=\3/;s/-//g;t;d')
[ -n "$mode" ] || die 'bad ls mode output'
-if ! cmd chown "$owner" "$upperdir"; then
- # int sysctl can't be read by read
- [ "$owner" = "$(dd if=/proc/sys/fs/overflowuid bs=16 status=none):$(dd if=/proc/sys/fs/overflowgid bs=16 status=none)" ] || die
- read uid_old uid_new uid_cnt < /proc/self/uid_map
- [ "$uid_old $uid_new" != "0 0" ] || die
- log 'detected user namespace, ignoring chown failure'
-fi
+cmd chown "$owner" "$upperdir" || die
cmd chmod "$mode" "$upperdir" || die
# -m - covers ACLs (system.posix_acl_access) and file caps
# (security.capability). theoretically someone might have get/setcap and/or