From: Thorsten Behrens <tbehrens@suse.com>
Date: Wed, 10 Dec 2014 10:53:43 +0000 (+0100)
Subject: Unconditionally chown rados log file.
X-Git-Tag: v0.80.11~59^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f0d2429f764aaa756fc8002309545b02dc45c199;p=ceph.git

Unconditionally chown rados log file.

This fixes bnc#905047 (in a somewhat ad-hoc way). Sadly the log
file gets created from several places, so its existence does not
mean init-radosgw had actually run.

Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
(cherry picked from commit 41611ea27a42d6221c418613d24dce34d988f2e6)
---

diff --git a/src/init-radosgw b/src/init-radosgw
index 5aa658c9f8c..914d6fddcc1 100644
--- a/src/init-radosgw
+++ b/src/init-radosgw
@@ -66,8 +66,10 @@ case "$1" in
             fi
 
             log_file=`$RADOSGW -n $name --show-config-value log_file`
-            if [ -n "$log_file" ] && [ ! -e "$log_file" ]; then
-                touch "$log_file"
+            if [ -n "$log_file" ]; then
+                if [ ! -e "$log_file" ]; then
+                    touch "$log_file"
+                fi
                 chown $user $log_file
             fi
 
diff --git a/src/init-radosgw.sysv b/src/init-radosgw.sysv
index fe56939003d..102e6409fc8 100644
--- a/src/init-radosgw.sysv
+++ b/src/init-radosgw.sysv
@@ -73,8 +73,10 @@ case "$1" in
             fi
 
             log_file=`$RADOSGW -n $name --show-config-value log_file`
-            if [ -n "$log_file" ] && [ ! -e "$log_file" ]; then
-                touch "$log_file"
+            if [ -n "$log_file" ]; then
+                if [ ! -e "$log_file" ]; then
+                    touch "$log_file"
+                fi
                 chown $user $log_file
             fi