diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2016-11-03 16:03:24 +1100 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2016-11-03 10:10:31 +0100 |
| commit | 9c6f0dc69bd9eb2ca2bc1ca18c81762791958f88 (patch) | |
| tree | e3a382c133785667c33543db5d2f2ff26fb242ba | |
| parent | e714dc03e0ccf9ec17da6bacc1bcfcaea7518e22 (diff) | |
| download | samba-9c6f0dc69bd9eb2ca2bc1ca18c81762791958f88.tar.gz | |
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 <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Thu Nov 3 10:10:31 CET 2016 on sn-devel-144
| -rwxr-xr-x | ctdb/config/ctdb-crash-cleanup.sh | 2 | ||||
| -rwxr-xr-x | ctdb/config/debug-hung-script.sh | 2 | ||||
| -rwxr-xr-x | ctdb/config/debug_locks.sh | 2 | ||||
| -rwxr-xr-x | 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 bcecbfeb564..22b0ce86f5f 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 cdf165763d7..da988c2f913 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 8c9b46657fa..f678724c434 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 4ac354ef29b..3f2dd39f68f 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" |