Skip to content

L
lxc
Unverified Commit 44c7d9c3 by Stéphane Graber Committed by GitHub
Options

Merge pull request #3097 from lpirl/proc-1-uid_map-permission-denied

suppress false-negative error in templates and nvidia hook
parents 61287e52 16a312e1
Showing with 31 additions and 7 deletions
hooks/nvidia
...@@ -58,8 +58,12 @@ in_userns() { ...@@ -58,8 +58,12 @@ in_userns() {
echo $fields | grep -q " 0 1$" && { echo userns-root; return; } || true echo $fields | grep -q " 0 1$" && { echo userns-root; return; } || true
done < /proc/self/uid_map done < /proc/self/uid_map
[ "$(cat /proc/self/uid_map)" = "$(cat /proc/1/uid_map)" ] && \ if [ -e /proc/1/uid_map ]; then
{ echo userns-root; return; } if [ "$(cat /proc/self/uid_map)" = "$(cat /proc/1/uid_map)" ]; then
echo userns-root
return
fi
fi
echo yes echo yes
} }
......
templates/lxc-busybox.in
...@@ -42,7 +42,12 @@ in_userns() { ...@@ -42,7 +42,12 @@ in_userns() {
fi fi
done < /proc/self/uid_map done < /proc/self/uid_map
[ "$(cat /proc/self/uid_map)" = "$(cat /proc/1/uid_map)" ] && { echo userns-root; return; } if [ -e /proc/1/uid_map ]; then
if [ "$(cat /proc/self/uid_map)" = "$(cat /proc/1/uid_map)" ]; then
echo userns-root
return
fi
fi
echo yes echo yes
} }
......
templates/lxc-download.in
...@@ -179,7 +179,12 @@ in_userns() { ...@@ -179,7 +179,12 @@ in_userns() {
fi fi
done < /proc/self/uid_map done < /proc/self/uid_map
[ "$(cat /proc/self/uid_map)" = "$(cat /proc/1/uid_map)" ] && { echo userns-root; return; } if [ -e /proc/1/uid_map ]; then
if [ "$(cat /proc/self/uid_map)" = "$(cat /proc/1/uid_map)" ]; then
echo userns-root
return
fi
fi
echo yes echo yes
} }
......
templates/lxc-local.in
...@@ -51,8 +51,13 @@ in_userns() { ...@@ -51,8 +51,13 @@ in_userns() {
fi fi
done < /proc/self/uid_map done < /proc/self/uid_map
[ "$(cat /proc/self/uid_map)" = "$(cat /proc/1/uid_map)" ] && { echo userns-root; return; } if [ -e /proc/1/uid_map ]; then
echo yes if [ "$(cat /proc/self/uid_map)" = "$(cat /proc/1/uid_map)" ]; then
echo userns-root
return
fi
fi
echo yes
} }
usage() { usage() {
......
templates/lxc-oci.in
...@@ -62,7 +62,12 @@ in_userns() { ...@@ -62,7 +62,12 @@ in_userns() {
fi fi
done < /proc/self/uid_map done < /proc/self/uid_map
[ "$(cat /proc/self/uid_map)" = "$(cat /proc/1/uid_map)" ] && { echo userns-root; return; } if [ -e /proc/1/uid_map ]; then
if [ "$(cat /proc/self/uid_map)" = "$(cat /proc/1/uid_map)" ]; then
echo userns-root
return
fi
fi
echo yes echo yes
} }
......
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