From: Stéphane Graber <stgraber@ubuntu.com>
Date: Thu, 27 Feb 2014 20:46:23 +0000 (-0500)
Subject: lxc-download: Ignore return code from subshell
X-Git-Tag: lxc-1.1.0.alpha1~260
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fda03e44e6dbe7bd13f68e0751b08e0fe5584106;p=thirdparty%2Flxc.git

lxc-download: Ignore return code from subshell

The previous change fixed parsing of multiple uid/gid ranges by using a
while loop, however a failure in that loop will cause the script to exit
(due to -e), so we need to ignore the return value of the commands
inside that loop.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/templates/lxc-download.in b/templates/lxc-download.in
index 732bd97b9..6a6bb1857 100644
--- a/templates/lxc-download.in
+++ b/templates/lxc-download.in
@@ -143,8 +143,8 @@ 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; }
-        echo $line | grep -q " 0 1$" && { echo userns-root; return; }
+        [ "$line" = "0 0 4294967295" ] && { echo no; return; } || true
+        echo $line | grep -q " 0 1$" && { echo userns-root; return; } || true
     done
 
     [ "$(cat /proc/self/uid_map)" = "$(cat /proc/1/uid_map)" ] && \