diff --git a/ctdb/config/events/legacy/01.reclock.script b/ctdb/config/events/legacy/01.reclock.script index c1cdbbca7fe..ab0f2f6a32b 100755 --- a/ctdb/config/events/legacy/01.reclock.script +++ b/ctdb/config/events/legacy/01.reclock.script @@ -29,6 +29,6 @@ init) esac d=$(dirname "$recovery_lock") - mkdir -vp "$d" + mkdir -p "$d" ;; esac diff --git a/ctdb/tests/eventscripts/01.reclock.init.003.sh b/ctdb/tests/eventscripts/01.reclock.init.003.sh index 85f1f3c6f80..a8b6abdf5b5 100755 --- a/ctdb/tests/eventscripts/01.reclock.init.003.sh +++ b/ctdb/tests/eventscripts/01.reclock.init.003.sh @@ -12,17 +12,7 @@ dir=$(dirname "$CTDB_RECOVERY_LOCK") required_result 1 "" unit_test test -d "$dir" -# FreeBSD mkdir -v just prints the filename. Filter the rest of the -# message from other platforms, including any exotic quotes around the -# filename. -result_filter () -{ - sed \ - -e 's|^\(mkdir: created directory \)[[:punct:]]||' \ - -e 's|[[:punct:]]$||' -} - -ok "$dir" +ok_null simple_test # Ensure directory exists after