From: Stéphane Graber <stgraber@ubuntu.com>
Date: Wed, 15 Jan 2014 02:31:49 +0000 (-0500)
Subject: lxc-download: POSIX doesn't specify -f for chown
X-Git-Tag: lxc-1.0.0.beta2~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d656b0549e67635ad9c24474b82dfa26e1f4512;p=thirdparty%2Flxc.git

lxc-download: POSIX doesn't specify -f for chown

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/templates/lxc-download.in b/templates/lxc-download.in
index c3180411c..0602bbc7d 100644
--- a/templates/lxc-download.in
+++ b/templates/lxc-download.in
@@ -396,7 +396,7 @@ if [ "$DOWNLOAD_USE_CACHE" = "false" ]; then
         echo $DOWNLOAD_BUILD > $LXC_CACHE_PATH/build_id
 
         if [ -n "$LXC_MAPPED_UID" ] && [ "$LXC_MAPPED_UID" != "-1" ]; then
-            chown $LXC_MAPPED_UID -Rf $LXC_CACHE_BASE >/dev/null 2>&1 || true
+            chown -R $LXC_MAPPED_UID $LXC_CACHE_BASE >/dev/null 2>&1 || true
         fi
         echo "The image cache is now ready"
     fi
@@ -489,7 +489,7 @@ for file in $TEMPLATE_FILES; do
 done
 
 if [ -n "$LXC_MAPPED_UID" ] && [ "$LXC_MAPPED_UID" != "-1" ]; then
-    chown $LXC_MAPPED_UID -f $LXC_PATH/config $LXC_PATH/fstab || true
+    chown $LXC_MAPPED_UID $LXC_PATH/config $LXC_PATH/fstab >/dev/null 2>&1 || true
 fi
 
 if [ -e "$(relevant_file create-message)" ]; then