From 5fd433e9d1a94c97542122227b293d531bf1b67e Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Thu, 3 Nov 2016 16:03:24 +1100 Subject: [PATCH] ctdb-scripts: Fix calculation of CTDB_BASE This is a regression introduced in f227c26178c2eaf3fae49f32a90ec905f85005f4. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12407 Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke Autobuild-User(master): Martin Schwenke Autobuild-Date(master): Thu Nov 3 10:10:31 CET 2016 on sn-devel-144 (cherry picked from commit 9c6f0dc69bd9eb2ca2bc1ca18c81762791958f88) --- ctdb/config/ctdb-crash-cleanup.sh | 2 +- ctdb/config/debug-hung-script.sh | 2 +- ctdb/config/debug_locks.sh | 2 +- ctdb/config/statd-callout | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ctdb/config/ctdb-crash-cleanup.sh b/ctdb/config/ctdb-crash-cleanup.sh index bcecbfe..22b0ce8 100755 --- a/ctdb/config/ctdb-crash-cleanup.sh +++ b/ctdb/config/ctdb-crash-cleanup.sh @@ -5,7 +5,7 @@ # [ -n "$CTDB_BASE" ] || \ - CTDB_BASE=$(d=$(dirname "$0") ; cd -P "$d" ; dirname "$PWD") + CTDB_BASE=$(d=$(dirname "$0") ; cd -P "$d" ; echo "$PWD") . "${CTDB_BASE}/functions" diff --git a/ctdb/config/debug-hung-script.sh b/ctdb/config/debug-hung-script.sh index cdf1657..da988c2 100755 --- a/ctdb/config/debug-hung-script.sh +++ b/ctdb/config/debug-hung-script.sh @@ -4,7 +4,7 @@ # for other operating systems. [ -n "$CTDB_BASE" ] || \ - CTDB_BASE=$(d=$(dirname "$0") ; cd -P "$d" ; dirname "$PWD") + CTDB_BASE=$(d=$(dirname "$0") ; cd -P "$d" ; echo "$PWD") . "${CTDB_BASE}/functions" diff --git a/ctdb/config/debug_locks.sh b/ctdb/config/debug_locks.sh index 8c9b466..f678724 100755 --- a/ctdb/config/debug_locks.sh +++ b/ctdb/config/debug_locks.sh @@ -8,7 +8,7 @@ # rather than mutex locks. [ -n "$CTDB_BASE" ] || \ - CTDB_BASE=$(d=$(dirname "$0") ; cd -P "$d" ; dirname "$PWD") + CTDB_BASE=$(d=$(dirname "$0") ; cd -P "$d" ; echo "$PWD") . "${CTDB_BASE}/functions" diff --git a/ctdb/config/statd-callout b/ctdb/config/statd-callout index 4ac354e..3f2dd39 100755 --- a/ctdb/config/statd-callout +++ b/ctdb/config/statd-callout @@ -9,7 +9,7 @@ # STATD_HOSTNAME="myhostname -H /etc/ctdb/statd-callout" [ -n "$CTDB_BASE" ] || \ - CTDB_BASE=$(d=$(dirname "$0") ; cd -P "$d" ; dirname "$PWD") + CTDB_BASE=$(d=$(dirname "$0") ; cd -P "$d" ; echo "$PWD") . "${CTDB_BASE}/functions" -- 2.7.4