]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
lxc-download: Fix in_userns again
authorStéphane Graber <stgraber@ubuntu.com>
Sat, 1 Mar 2014 00:12:47 +0000 (19:12 -0500)
committerStéphane Graber <stgraber@ubuntu.com>
Sat, 1 Mar 2014 00:13:50 +0000 (19:13 -0500)
The use of a subshell was causing various failures, re-arrange not to
use one.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
templates/lxc-download.in

index 6a6bb1857c7633a686151282069f7d3ef85931ac..487383e0a0fe10119fc77c34e6d5d0e1bab1c8c8 100644 (file)
@@ -142,10 +142,11 @@ gpg_validate() {
 
 in_userns() {
     [ -e /proc/self/uid_map ] || { echo no; return; }
-    awk '{ print $1 " " $2 " " $3 }' /proc/self/uid_map | while read line; do
-        [ "$line" = "0 0 4294967295" ] && { echo no; return; } || true
-        echo $line | grep -q " 0 1$" && { echo userns-root; return; } || true
-    done
+    while read line; do
+        fields=$(echo $line | awk '{ print $1 " " $2 " " $3 }')
+        [ "$fields" = "0 0 4294967295" ] && { echo no; return; } || true
+        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)" ] && \
         { echo userns-root; return; }