From: Martin Schwenke <mschwenke@ddn.com>
Date: Thu, 9 Apr 2026 02:12:29 +0000 (+1000)
Subject: ctdb-scripts: No longer attempt to delete IP from new interface
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=8aa0e63608727de044c2bbea99a56bbafc66a271;p=thirdparty%2Fsamba.git

ctdb-scripts: No longer attempt to delete IP from new interface

Since commit 6471541d6d2bc9f2af0ff92b280abbd1d933cf88 this is
completely unnecessary because interface $oiface is determined by
looking at the system.

Signed-off-by: Martin Schwenke <mschwenke@ddn.com>
Reviewed-by: John Mulligan <jmulligan@redhat.com>
---

diff --git a/ctdb/config/events/legacy/10.interface.script b/ctdb/config/events/legacy/10.interface.script
index 4c1371176fd..82110b1e818 100755
--- a/ctdb/config/events/legacy/10.interface.script
+++ b/ctdb/config/events/legacy/10.interface.script
@@ -198,7 +198,7 @@ updateip)
 	# The steps are:
 	#
 	# 1) firewall this IP, so no new external packets arrive for it
-	# 2) remove the IP from the old interface (and new interface, to be sure)
+	# 2) remove the IP from the old interface
 	# 3) add the IP to the new interface
 	# 4) remove the firewall rule
 	# 5) use ctdb gratarp to propagate the new mac address
@@ -226,7 +226,6 @@ updateip)
 		ip_block "$ip" "$oiface"
 		delete_ip_from_iface "$oiface" "$ip" "$maskbits" >/dev/null 2>&1
 	fi
-	delete_ip_from_iface "$niface" "$ip" "$maskbits" >/dev/null 2>&1
 
 	if ! add_ip_to_iface "$niface" "$ip" "$_maskbits"; then
 		ip_unblock "$ip" "$oiface"