suppress false-negative error in templates and nvidia hook

``/proc`` might be mounted with ``hidepid=2``. This makes ``/proc/1/…`` appear absent for non-root users. When using the templates or the nvidia hook as a non-root user (e.g., when creating unprivileged containers) the error "/proc/1/uid_map: No such file or directory" is printed. Since the script works correctly despite the error, this error message might be confusing for users. Signed-off-by: Lukas Pirl <git@lukas-pirl.de>

suppress false-negative error in templates and nvidia hook
fc02bd72 · Lukas Pirl · Christian Brauner · d1d67dab · fc02bd72 · fc02bd72
Unverified Commit fc02bd72 authored Jul 22, 2019 by Lukas Pirl Committed by Christian Brauner Dec 02, 2019
Showing with 31 additions and 7 deletions

nvidia hooks/nvidia +6 -2

lxc-busybox.in templates/lxc-busybox.in +6 -1

lxc-download.in templates/lxc-download.in +6 -1

lxc-local.in templates/lxc-local.in +7 -2

lxc-oci.in templates/lxc-oci.in +6 -1

No files found.
--- a/hooks/nvidia
+++ b/hooks/nvidia
@@ -58,8 +58,12 @@ in_userns() {
        echo $fields | grep -q " 0 1$" && { echo userns-root; return; } || true
    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
 }

--- a/templates/lxc-busybox.in
+++ b/templates/lxc-busybox.in
@@ -42,7 +42,12 @@ in_userns() {
    fi
  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
 }

--- a/templates/lxc-download.in
+++ b/templates/lxc-download.in
@@ -179,7 +179,12 @@ in_userns() {
    fi
  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
 }

--- a/templates/lxc-local.in
+++ b/templates/lxc-local.in
@@ -51,8 +51,13 @@ in_userns() {
    fi
  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() {

--- a/templates/lxc-oci.in
+++ b/templates/lxc-oci.in
@@ -62,7 +62,12 @@ in_userns() {
    fi
  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
 }