From 118436cd50210c86df8f0ce7ed7deeecf3669c0f Mon Sep 17 00:00:00 2001
From: Roman Vanicek <roman.vanicek@ivasoft.cz>
Date: Fri, 27 Feb 2026 20:22:24 +0000
Subject: [PATCH] Fix join and ctdb node re-resolve

---
 crontab.ctdb  | 2 +-
 entrypoint.sh | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/crontab.ctdb b/crontab.ctdb
index 128780a..fd1f5d4 100644
--- a/crontab.ctdb
+++ b/crontab.ctdb
@@ -7,4 +7,4 @@ SHELL=/bin/bash
 # |  |  |  |  .---- day of week (0 - 6) (Sunday=0 or 7) OR sun,mon,tue,wed,thu,fri,sat
 # |  |  |  |  |
 # *  *  *  *  * user-name command to be executed
-* * * * * root ctdb reloadnodes
\ No newline at end of file
+* * * * * root /usr/bin/ctdb reloadnodes
\ No newline at end of file
diff --git a/entrypoint.sh b/entrypoint.sh
index bf7c838..390a561 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -2,9 +2,7 @@
 
 #
 # TODO
-#		* on startup resolveNodes.sh usually resolves just itself and 'ctdb reloadnodes' must be called on some node
 #		* maybe remove ctdb-volatile
-#		* 'net ads info' is not a proper join status check
 
 # Loosely based on https://github.com/fjudith/docker-samba-join-ad/tree/master/sssd
 
@@ -172,8 +170,8 @@ if ! net ads testjoin; then
   # Join
   net ads join --no-dns-updates -U"$ADMIN_ACCOUNT"%"$ADMIN_PASSWORD"
 
-  ((/usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf -j /tmp/sp.pid)&)
-  sleep 30
+  ((/usr/bin/supervisord -c /root/supervisord.samba.conf -j /tmp/sp.pid)&)
+  sleep 10
 
   # Allow adding printer drivers for Administrator
   # Note: These commands require running winbind that resolves the group name and dcerpcd that accesses printers list