init-ceph: fix (and test!) cleanlogs and cleanalllogs

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/init-ceph.in b/src/init-ceph.in
index 400972ae23f13268a68d867c2300cc0f5dc4b6fa..6525cfed1c91bccee9365fc7c1e7af418317f3f0 100644 (file)
--- a/src/init-ceph.in
+++ b/src/init-ceph.in
@@ -314,15 +314,15 @@ for name in $what; do
        cleanlogs)
            echo removing logs
            if [ -n "$log_sym_dir" ]; then
-               do_cmd "for f in $log_sym_dir/$name*; do rm -f \`readlink \$f\` ; rm -f \$f ; done ; rm -f $log_dir/$name.*"
-           else
-               do_cmd "rm -f $log_dir/$name.*"
+               do_cmd "for f in $log_sym_dir/$type.$id.*; do rm -f \`readlink \$f\` ; rm -f \$f ; done ; rm -f $log_dir/$type.$id.*"
            fi
+           [ -n "$log_dir" ] && do_cmd "rm -f $log_dir/$type.$id.*"
            ;;
 
        cleanalllogs)
            echo removing all logs
-           do_cmd "rm -f $log_dir/* $log_sym_dir/* || true"
+           [ -n "$log_sym_dir" ] && do_cmd "rm -f $log_sym_dir/*"
+           [ -n "$log_dir" ] && do_cmd "rm -f $log_dir/*"
            ;;
 
        *)