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>

diff --git a/src/init-radosgw b/src/init-radosgw
index c38ddad616e57e8f15749c4fbae40861ecceccea..1ef71c43d6a2f428585b57febe733ecfa987b174 100644 (file)
--- a/src/init-radosgw
+++ b/src/init-radosgw
@@ -72,8 +72,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 2e9df1faff5d1baafdb5d241dfb9eedb65c976a3..e210b79144ea475ca2aa815c95ec73191433bf03 100644 (file)
--- a/src/init-radosgw.sysv
+++ b/src/init-radosgw.sysv
@@ -79,8 +79,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