From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 9662A1FF141 for ; Mon, 30 Mar 2026 23:48:47 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7BCD0985F; Mon, 30 Mar 2026 23:49:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=rchrist.io; s=default; t=1774906777; bh=riAOxhpu09KWgAoueNQk34cTc4bN6eFDXZWot2aV5ZE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lKTejohOW8MYKWX9Qqa97Iy7JU2ThnzA0lajfplrBcqJvtHZwnMwd3wM+QtrOqBS+ 6gcO0lPvOgTSlPFragyZ/tPZiOB8nxkLhjJMqP3xVUhEXdj5G3AGqyp3+Y47PvEJCt eSapJ9WAh0s44OUfgpae+TnYsqjXLo29EY618OdDzj1fvxbPL/NpHPhLYBDmuRoZno UcGeHNA7MQpy9RplKqC8kbogAfEr/elWqCFR6Q8lEs8pTPsdvov3yIbVmXv6rziIPs aoJEluFKHbKkAFjioof4zyKO0AaKjEfunnItqCo7qnY3NSLE3iJ5AZY7dmhntIVCM1 bq6h+a3SK91jA== From: Robin Christ To: pve-devel@lists.proxmox.com Subject: [PATCH ifupdown2 1/4] nlcache: Fix missing nodad option in addr_add_dry_run Date: Mon, 30 Mar 2026 23:39:18 +0200 Message-ID: <20260330213921.533853-2-robin@rchrist.io> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260330213921.533853-1-robin@rchrist.io> References: <20260330213921.533853-1-robin@rchrist.io> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.750 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DKIM_SIGNED 0.1 Message has a DKIM or DK signature, not necessarily valid DKIM_VALID -0.1 Message has at least one valid DKIM or DK signature DKIM_VALID_AU -0.1 Message has a valid DKIM or DK signature from author's domain DKIM_VALID_EF -0.1 Message has a valid DKIM or DK signature from envelope-from domain DMARC_MISSING 0.1 Missing DMARC policy RCVD_IN_DNSWL_NONE -0.0001 Sender listed at https://www.dnswl.org/, no trust SPF_HELO_PASS -0.001 SPF: HELO matches SPF record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: NV6DS46XFFUHDP6XBOQ6DSGBX4LBJ6JH X-Message-ID-Hash: NV6DS46XFFUHDP6XBOQ6DSGBX4LBJ6JH X-MailFrom: robin@rchrist.io X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Robin Christ X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Robin Christ nodad option was added to nlcache NetlinkListenerWithCache addr_add, but not addr_add_dry_run, breaking dry runs (--no-act) with the error NetlinkListenerWithCache.addr_add_dry_run() got an unexpected keyword argument 'nodad' Signed-off-by: Robin Christ --- ...ing-nodad-option-in-addr_add_dry_run.patch | 35 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 36 insertions(+) create mode 100644 debian/patches/pve/0016-nlcache-fix-missing-nodad-option-in-addr_add_dry_run.patch diff --git a/debian/patches/pve/0016-nlcache-fix-missing-nodad-option-in-addr_add_dry_run.patch b/debian/patches/pve/0016-nlcache-fix-missing-nodad-option-in-addr_add_dry_run.patch new file mode 100644 index 0000000..6706fd7 --- /dev/null +++ b/debian/patches/pve/0016-nlcache-fix-missing-nodad-option-in-addr_add_dry_run.patch @@ -0,0 +1,35 @@ +From: Robin Christ +Date: Mon, 30 Mar 2026 18:44:20 +0200 +Subject: nlcache: Fix missing nodad option in addr_add_dry_run + +nodad option was added to nlcache NetlinkListenerWithCache addr_add, but not addr_add_dry_run, +breaking dry runs (--no-act) with the error + +NetlinkListenerWithCache.addr_add_dry_run() got an unexpected keyword argument 'nodad' + +Signed-off-by: Robin Christ +--- + ifupdown2/lib/nlcache.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/ifupdown2/lib/nlcache.py b/ifupdown2/lib/nlcache.py +index 33dd909..a92ac6f 100644 +--- a/ifupdown2/lib/nlcache.py ++++ b/ifupdown2/lib/nlcache.py +@@ -3393,12 +3393,15 @@ class NetlinkListenerWithCache(nllistener.NetlinkManagerWithListener, BaseObject + # ADDRESS + ############################################################################ + +- def addr_add_dry_run(self, ifname, addr, broadcast=None, peer=None, scope=None, preferred_lifetime=None, metric=None): ++ def addr_add_dry_run(self, ifname, addr, broadcast=None, peer=None, scope=None, preferred_lifetime=None, metric=None, nodad=False): + log_msg = ["netlink: ip addr add %s dev %s" % (addr, ifname)] + + if scope: + log_msg.append("scope %s" % scope) + ++ if nodad: ++ log_msg.append("nodad") ++ + if broadcast: + log_msg.append("broadcast %s" % broadcast) + diff --git a/debian/patches/series b/debian/patches/series index 2865533..8655369 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -16,3 +16,4 @@ upstream/0001-use-raw-strings-for-regex-to-fix-backslash-interpret.patch upstream/0002-vxlan-add-support-for-IPv6-vxlan-local-tunnelip.patch pve/0014-nlmanager-read-ipv6-devconf-disable_ipv6-attribute-t.patch pve/0015-revert-addons-bond-warn-if-sub-interface-is-detected-on-bond-slave.patch +pve/0016-nlcache-fix-missing-nodad-option-in-addr_add_dry_run.patch -- 2.47.3