The branch, master has been updated
via 7f3222d0042 ctdb-scripts: Fix CTDB_BASE to allow event scripts to
run standalone
from a814f5d90a3 python:lsa_utils: Fix fallback to OpenPolicy2
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 7f3222d00422205af2f9c317809f783468bc9afa
Author: yogita72 <yogita.bij...@gmail.com>
Date: Tue Feb 4 02:05:11 2025 +0000
ctdb-scripts: Fix CTDB_BASE to allow event scripts to run standalone
commit 12fd8d7a5c5d14d403aac6cd9e318afcd0a8e159 broke this when it moved
the eventscripts
down a subdirectory without changing this boilerplate.
Signed-off-by: yogita72 <yogita.bij...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
Reviewed-by: Günther Deschner <g...@samba.org>
Autobuild-User(master): Martin Schwenke <mart...@samba.org>
Autobuild-Date(master): Wed Feb 19 02:43:44 UTC 2025 on atb-devel-224
-----------------------------------------------------------------------
Summary of changes:
ctdb/config/events/legacy/00.ctdb.script | 2 +-
ctdb/config/events/legacy/01.reclock.script | 2 +-
ctdb/config/events/legacy/05.system.script | 2 +-
ctdb/config/events/legacy/10.interface.script | 2 +-
ctdb/config/events/legacy/11.natgw.script | 2 +-
ctdb/config/events/legacy/11.routing.script | 2 +-
ctdb/config/events/legacy/13.per_ip_routing.script | 2 +-
ctdb/config/events/legacy/20.multipathd.script | 2 +-
ctdb/config/events/legacy/31.clamd.script | 2 +-
ctdb/config/events/legacy/40.vsftpd.script | 2 +-
ctdb/config/events/legacy/41.httpd.script | 2 +-
ctdb/config/events/legacy/46.update-keytabs.script | 2 +-
ctdb/config/events/legacy/47.samba-dcerpcd.script | 2 +-
ctdb/config/events/legacy/48.netbios.script | 2 +-
ctdb/config/events/legacy/49.winbind.script | 2 +-
ctdb/config/events/legacy/50.samba.script | 2 +-
ctdb/config/events/legacy/60.nfs.script | 2 +-
ctdb/config/events/legacy/70.iscsi.script | 2 +-
ctdb/config/events/legacy/91.lvs.script | 2 +-
ctdb/config/events/legacy/95.database.script | 2 +-
20 files changed, 20 insertions(+), 20 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/config/events/legacy/00.ctdb.script
b/ctdb/config/events/legacy/00.ctdb.script
index 0c73f80c6aa..58f98d5ecaf 100755
--- a/ctdb/config/events/legacy/00.ctdb.script
+++ b/ctdb/config/events/legacy/00.ctdb.script
@@ -4,7 +4,7 @@
# elsewhere.
[ -n "$CTDB_BASE" ] ||
- CTDB_BASE=$(d=$(dirname "$0") && cd -P "$d" && dirname "$PWD")
+ CTDB_BASE=$(d="$(dirname "$0")" && cd -P "$d/../../" && pwd)
. "${CTDB_BASE}/functions"
diff --git a/ctdb/config/events/legacy/01.reclock.script
b/ctdb/config/events/legacy/01.reclock.script
index 04068750efa..14530bf8301 100755
--- a/ctdb/config/events/legacy/01.reclock.script
+++ b/ctdb/config/events/legacy/01.reclock.script
@@ -2,7 +2,7 @@
# script to check accessibility to the reclock file on a node
[ -n "$CTDB_BASE" ] || \
- CTDB_BASE=$(d=$(dirname "$0") && cd -P "$d" && dirname "$PWD")
+ CTDB_BASE=$(d="$(dirname "$0")" && cd -P "$d/../../" && pwd)
. "${CTDB_BASE}/functions"
diff --git a/ctdb/config/events/legacy/05.system.script
b/ctdb/config/events/legacy/05.system.script
index bf36dd21ffa..47f3acbce44 100755
--- a/ctdb/config/events/legacy/05.system.script
+++ b/ctdb/config/events/legacy/05.system.script
@@ -2,7 +2,7 @@
# ctdb event script for checking local file system utilization
[ -n "$CTDB_BASE" ] ||
- CTDB_BASE=$(d=$(dirname "$0") && cd -P "$d" && dirname "$PWD")
+ CTDB_BASE=$(d="$(dirname "$0")" && cd -P "$d/../../" && pwd)
. "${CTDB_BASE}/functions"
diff --git a/ctdb/config/events/legacy/10.interface.script
b/ctdb/config/events/legacy/10.interface.script
index 8d2d6968a1d..cb7c958ec95 100755
--- a/ctdb/config/events/legacy/10.interface.script
+++ b/ctdb/config/events/legacy/10.interface.script
@@ -4,7 +4,7 @@
# interfaces used by public IP addresses.
[ -n "$CTDB_BASE" ] ||
- CTDB_BASE=$(d=$(dirname "$0") && cd -P "$d" && dirname "$PWD")
+ CTDB_BASE=$(d="$(dirname "$0")" && cd -P "$d/../../" && pwd)
. "${CTDB_BASE}/functions"
diff --git a/ctdb/config/events/legacy/11.natgw.script
b/ctdb/config/events/legacy/11.natgw.script
index fb93dea6d5e..ca81a376273 100755
--- a/ctdb/config/events/legacy/11.natgw.script
+++ b/ctdb/config/events/legacy/11.natgw.script
@@ -6,7 +6,7 @@
#
[ -n "$CTDB_BASE" ] || \
- CTDB_BASE=$(d=$(dirname "$0") && cd -P "$d" && dirname "$PWD")
+ CTDB_BASE=$(d="$(dirname "$0")" && cd -P "$d/../../" && pwd)
. "${CTDB_BASE}/functions"
diff --git a/ctdb/config/events/legacy/11.routing.script
b/ctdb/config/events/legacy/11.routing.script
index 7ba7f3bf4a8..a6abf594df3 100755
--- a/ctdb/config/events/legacy/11.routing.script
+++ b/ctdb/config/events/legacy/11.routing.script
@@ -18,7 +18,7 @@
# bond1 10.3.3.0/24 10.0.0.1
[ -n "$CTDB_BASE" ] || \
- CTDB_BASE=$(d=$(dirname "$0") && cd -P "$d" && dirname "$PWD")
+ CTDB_BASE=$(d="$(dirname "$0")" && cd -P "$d/../../" && pwd)
. "${CTDB_BASE}/functions"
diff --git a/ctdb/config/events/legacy/13.per_ip_routing.script
b/ctdb/config/events/legacy/13.per_ip_routing.script
index d7949c6dedb..fa358bae058 100755
--- a/ctdb/config/events/legacy/13.per_ip_routing.script
+++ b/ctdb/config/events/legacy/13.per_ip_routing.script
@@ -1,7 +1,7 @@
#!/bin/sh
[ -n "$CTDB_BASE" ] || \
- CTDB_BASE=$(d=$(dirname "$0") && cd -P "$d" && dirname "$PWD")
+ CTDB_BASE=$(d="$(dirname "$0")" && cd -P "$d/../../" && pwd)
. "${CTDB_BASE}/functions"
diff --git a/ctdb/config/events/legacy/20.multipathd.script
b/ctdb/config/events/legacy/20.multipathd.script
index a420251d92c..74edcb5abf4 100755
--- a/ctdb/config/events/legacy/20.multipathd.script
+++ b/ctdb/config/events/legacy/20.multipathd.script
@@ -7,7 +7,7 @@
#
[ -n "$CTDB_BASE" ] || \
- CTDB_BASE=$(d=$(dirname "$0") && cd -P "$d" && dirname "$PWD")
+ CTDB_BASE=$(d="$(dirname "$0")" && cd -P "$d/../../" && pwd)
. "${CTDB_BASE}/functions"
diff --git a/ctdb/config/events/legacy/31.clamd.script
b/ctdb/config/events/legacy/31.clamd.script
index 5d60fe3aa37..966f63cc30a 100755
--- a/ctdb/config/events/legacy/31.clamd.script
+++ b/ctdb/config/events/legacy/31.clamd.script
@@ -2,7 +2,7 @@
# event script to manage clamd in a cluster environment
[ -n "$CTDB_BASE" ] || \
- CTDB_BASE=$(d=$(dirname "$0") && cd -P "$d" && dirname "$PWD")
+ CTDB_BASE=$(d="$(dirname "$0")" && cd -P "$d/../../" && pwd)
. "${CTDB_BASE}/functions"
diff --git a/ctdb/config/events/legacy/40.vsftpd.script
b/ctdb/config/events/legacy/40.vsftpd.script
index 2d2aac47033..6497c715888 100755
--- a/ctdb/config/events/legacy/40.vsftpd.script
+++ b/ctdb/config/events/legacy/40.vsftpd.script
@@ -2,7 +2,7 @@
# event strict to manage vsftpd in a cluster environment
[ -n "$CTDB_BASE" ] || \
- CTDB_BASE=$(d=$(dirname "$0") && cd -P "$d" && dirname "$PWD")
+ CTDB_BASE=$(d="$(dirname "$0")" && cd -P "$d/../../" && pwd)
. "${CTDB_BASE}/functions"
diff --git a/ctdb/config/events/legacy/41.httpd.script
b/ctdb/config/events/legacy/41.httpd.script
index dd90aeda274..51d85947ff3 100755
--- a/ctdb/config/events/legacy/41.httpd.script
+++ b/ctdb/config/events/legacy/41.httpd.script
@@ -2,7 +2,7 @@
# event script to manage httpd in a cluster environment
[ -n "$CTDB_BASE" ] || \
- CTDB_BASE=$(d=$(dirname "$0") && cd -P "$d" && dirname "$PWD")
+ CTDB_BASE=$(d="$(dirname "$0")" && cd -P "$d/../../" && pwd)
. "${CTDB_BASE}/functions"
diff --git a/ctdb/config/events/legacy/46.update-keytabs.script
b/ctdb/config/events/legacy/46.update-keytabs.script
index f207a7b6a8f..fa89af7a172 100755
--- a/ctdb/config/events/legacy/46.update-keytabs.script
+++ b/ctdb/config/events/legacy/46.update-keytabs.script
@@ -2,7 +2,7 @@
# script to update keytab
[ -n "$CTDB_BASE" ] ||
- CTDB_BASE=$(d=$(dirname "$0") && cd -P "$d" && dirname "$PWD")
+ CTDB_BASE=$(d="$(dirname "$0")" && cd -P "$d/../../" && pwd)
case "$1" in
recovered)
diff --git a/ctdb/config/events/legacy/47.samba-dcerpcd.script
b/ctdb/config/events/legacy/47.samba-dcerpcd.script
index 9492d553a62..fae9ee9f0f0 100755
--- a/ctdb/config/events/legacy/47.samba-dcerpcd.script
+++ b/ctdb/config/events/legacy/47.samba-dcerpcd.script
@@ -2,7 +2,7 @@
# ctdb event script for SAMBA DCERPCD Services
[ -n "$CTDB_BASE" ] || \
- CTDB_BASE=$(d=$(dirname "$0") && cd -P "$d" && dirname "$PWD")
+ CTDB_BASE=$(d="$(dirname "$0")" && cd -P "$d/../../" && pwd)
. "${CTDB_BASE}/functions"
diff --git a/ctdb/config/events/legacy/48.netbios.script
b/ctdb/config/events/legacy/48.netbios.script
index 1531e4919de..ed0f871f939 100755
--- a/ctdb/config/events/legacy/48.netbios.script
+++ b/ctdb/config/events/legacy/48.netbios.script
@@ -2,7 +2,7 @@
# ctdb event script for Netbios Name Services
[ -n "$CTDB_BASE" ] || \
- CTDB_BASE=$(d=$(dirname "$0") && cd -P "$d" && dirname "$PWD")
+ CTDB_BASE=$(d="$(dirname "$0")" && cd -P "$d/../../" && pwd)
. "${CTDB_BASE}/functions"
diff --git a/ctdb/config/events/legacy/49.winbind.script
b/ctdb/config/events/legacy/49.winbind.script
index 852b54165cf..999353e2d8d 100755
--- a/ctdb/config/events/legacy/49.winbind.script
+++ b/ctdb/config/events/legacy/49.winbind.script
@@ -2,7 +2,7 @@
# ctdb event script for winbind
[ -n "$CTDB_BASE" ] || \
- CTDB_BASE=$(d=$(dirname "$0") && cd -P "$d" && dirname "$PWD")
+ CTDB_BASE=$(d="$(dirname "$0")" && cd -P "$d/../../" && pwd)
. "${CTDB_BASE}/functions"
diff --git a/ctdb/config/events/legacy/50.samba.script
b/ctdb/config/events/legacy/50.samba.script
index c9d34cd2245..41864d59e80 100755
--- a/ctdb/config/events/legacy/50.samba.script
+++ b/ctdb/config/events/legacy/50.samba.script
@@ -2,7 +2,7 @@
# ctdb event script for Samba
[ -n "$CTDB_BASE" ] ||
- CTDB_BASE=$(d=$(dirname "$0") && cd -P "$d" && dirname "$PWD")
+ CTDB_BASE=$(d="$(dirname "$0")" && cd -P "$d/../../" && pwd)
. "${CTDB_BASE}/functions"
diff --git a/ctdb/config/events/legacy/60.nfs.script
b/ctdb/config/events/legacy/60.nfs.script
index b797ada9370..c59a0c18ea8 100755
--- a/ctdb/config/events/legacy/60.nfs.script
+++ b/ctdb/config/events/legacy/60.nfs.script
@@ -2,7 +2,7 @@
# script to manage nfs in a clustered environment
[ -n "$CTDB_BASE" ] ||
- CTDB_BASE=$(d=$(dirname "$0") && cd -P "$d" && dirname "$PWD")
+ CTDB_BASE=$(d="$(dirname "$0")" && cd -P "$d/../../" && pwd)
. "${CTDB_BASE}/functions"
diff --git a/ctdb/config/events/legacy/70.iscsi.script
b/ctdb/config/events/legacy/70.iscsi.script
index e74651d8eb1..72069f0930e 100755
--- a/ctdb/config/events/legacy/70.iscsi.script
+++ b/ctdb/config/events/legacy/70.iscsi.script
@@ -3,7 +3,7 @@
# CTDB event script for TGTD based iSCSI
[ -n "$CTDB_BASE" ] || \
- CTDB_BASE=$(d=$(dirname "$0") && cd -P "$d" && dirname "$PWD")
+ CTDB_BASE=$(d="$(dirname "$0")" && cd -P "$d/../../" && pwd)
. "${CTDB_BASE}/functions"
diff --git a/ctdb/config/events/legacy/91.lvs.script
b/ctdb/config/events/legacy/91.lvs.script
index 885506873a0..b532194fd60 100755
--- a/ctdb/config/events/legacy/91.lvs.script
+++ b/ctdb/config/events/legacy/91.lvs.script
@@ -2,7 +2,7 @@
# script to manage the lvs ip multiplexer for a single public address cluster
[ -n "$CTDB_BASE" ] || \
- CTDB_BASE=$(d=$(dirname "$0") && cd -P "$d" && dirname "$PWD")
+ CTDB_BASE=$(d="$(dirname "$0")" && cd -P "$d/../../" && pwd)
. "${CTDB_BASE}/functions"
diff --git a/ctdb/config/events/legacy/95.database.script
b/ctdb/config/events/legacy/95.database.script
index e2627c6c1d0..1b15e26ddaf 100755
--- a/ctdb/config/events/legacy/95.database.script
+++ b/ctdb/config/events/legacy/95.database.script
@@ -4,7 +4,7 @@
# elsewhere.
[ -n "$CTDB_BASE" ] ||
- CTDB_BASE=$(d=$(dirname "$0") && cd -P "$d" && dirname "$PWD")
+ CTDB_BASE=$(d="$(dirname "$0")" && cd -P "$d/../../" && pwd)
. "${CTDB_BASE}/functions"
--
Samba Shared Repository
