lxc-download: Fix in_userns again

The use of a subshell was causing various failures, re-arrange not to use one. Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>

lxc-download: Fix in_userns again
9f15e86a · Stéphane Graber · b707e368 · 9f15e86a
Commit 9f15e86a authored Feb 28, 2014 by Stéphane Graber
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

lxc-download.in templates/lxc-download.in +5 -4

No files found.
--- a/templates/lxc-download.in
+++ b/templates/lxc-download.in
@@ -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
+    while read line; do
-        [ "$line" = "0 0 4294967295" ] && { echo no; return; } || true
+        fields=$(echo $line | awk '{ print $1 " " $2 " " $3 }')
-        echo $line | grep -q " 0 1$" && { echo userns-root; return; } || true
+        [ "$fields" = "0 0 4294967295" ] && { echo no; return; } || true
-    done
+        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; }