mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-08-31 05:39:33 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
suppress false-negative error in templates and nvidia hook
This commit is contained in:
Stéphane Graber
2019-08-27 13:38:57 -06:00
committed by GitHub
parent 61287e5241 16a312e118
commit 44c7d9c39c
5 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hooks/nvidia
View File

@@ -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
} }

7
templates/lxc-busybox.in
View File

@@ -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
} }

7
templates/lxc-download.in
View File

@@ -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
} }

9
templates/lxc-local.in
View File

@@ -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() {

7
templates/lxc-oci.in
View File

@@ -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
} }