Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rules/ifupdown2.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ifupdown2 package

IFUPDOWN2_VERSION = 3.0.0-1
IFUPDOWN2_VERSION = 3.9.0
export IFUPDOWN2_VERSION

IFUPDOWN2 = ifupdown2_$(IFUPDOWN2_VERSION)_all.deb
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ Signed-off-by: Ravi Minnikanti <[email protected]>
1 file changed, 10 insertions(+)

diff --git a/ifupdown2/addons/vrf.py b/ifupdown2/addons/vrf.py
index 206c118..83bba50 100644
index 712c5fd..c88e5a5 100644
--- a/ifupdown2/addons/vrf.py
+++ b/ifupdown2/addons/vrf.py
@@ -272,6 +272,13 @@ class vrf(Addon, moduleBase):
'map (%s)\n' %errstr)
@@ -265,6 +265,13 @@ class vrf(Addon, moduleBase):
'map (%s)' %errstr)
self.warn_on_vrf_map_write_err = False

+ def _ensure_iproute2_vrf_dir(self):
+ """Ensure the iproute2 VRF map directory exists"""
+ vrf_dir = os.path.dirname(self.iproute2_vrf_filename)
Expand All @@ -37,30 +37,29 @@ index 206c118..83bba50 100644
def _iproute2_vrf_map_sync_to_disk(self):
if (ifupdownflags.flags.DRYRUN or
not self.iproute2_vrf_map_sync_to_disk):
@@ -279,6 +286,7 @@ class vrf(Addon, moduleBase):
@@ -272,6 +279,7 @@ class vrf(Addon, moduleBase):
self.logger.info('vrf: syncing table map to %s'
%self.iproute2_vrf_filename)
try:
+ self._ensure_iproute2_vrf_dir()
with open(self.iproute2_vrf_filename, 'w') as f:
f.write(self.iproute2_vrf_filehdr %(self.vrf_table_id_start,
self.vrf_table_id_end))
@@ -294,6 +302,7 @@ class vrf(Addon, moduleBase):
@@ -286,6 +294,7 @@ class vrf(Addon, moduleBase):
%self.iproute2_vrf_filename)
if ifupdownflags.flags.DRYRUN:
return
+ self._ensure_iproute2_vrf_dir()
fmode = 'a+' if append else 'w'
if not append:
# write file header
@@ -365,6 +374,7 @@ class vrf(Addon, moduleBase):
@@ -357,6 +366,7 @@ class vrf(Addon, moduleBase):
old_vrf_name = self.iproute2_vrf_map.get(int(table_id))
if not old_vrf_name:
self.iproute2_vrf_map[int(table_id)] = vrfifaceobj.name
+ self._ensure_iproute2_vrf_dir()
with open(self.iproute2_vrf_filename, "a+") as vrf_map_fd:
vrf_map_fd.write('%s %s\n'
% (table_id, vrfifaceobj.name))
--
--
2.25.1

31 changes: 0 additions & 31 deletions src/ifupdown2/patch/0001-fix-broadcast-addr-encoding.patch

This file was deleted.

36 changes: 0 additions & 36 deletions src/ifupdown2/patch/0002-disable-checks-when-using-no-wait.patch

This file was deleted.

26 changes: 26 additions & 0 deletions src/ifupdown2/patch/0002-remove-ifupdown2d-from-setup-py.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
From 231411a43b1ff9ef175c251be72fa02b938a077e Mon Sep 17 00:00:00 2001
From: Spandan Chowdhury <[email protected]>
Date: Tue, 31 Mar 2026 10:46:52 -0700
Subject: [PATCH] Remove ifupdown2d from setup.py DATA_FILES

The ifupdown2d daemon was removed from the source tree but setup.py
still references it in DATA_FILES for deb package builds, causing
the build to fail with a FileNotFoundError.

Signed-off-by: Spandan Chowdhury <[email protected]>
---
setup.py | 1 -
1 file changed, 1 deletion(-)

diff --git a/setup.py b/setup.py
index b555c7b..bf48297 100755
--- a/setup.py
+++ b/setup.py
@@ -30,7 +30,6 @@ def build_deb_package():


if build_deb_package():
- DATA_FILES.append(('/usr/share/ifupdown2/', ['ifupdown2/ifupdown2d']))
DATA_FILES.append(('/usr/share/ifupdown2/sbin/', ['ifupdown2/sbin/start-networking']))
else:
ENTRY_POINTS = {

This file was deleted.

26 changes: 0 additions & 26 deletions src/ifupdown2/patch/bug-296-python-3.12-compability.patch

This file was deleted.

7 changes: 2 additions & 5 deletions src/ifupdown2/patch/series
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
0001-fix-broadcast-addr-encoding.patch
0002-disable-checks-when-using-no-wait.patch
0003-Fix-the-return-value-of-utils._execute_subprocess-me.patch
bug-296-python-3.12-compability.patch
0004-Ensure-etc-iproute2-rt_tables.d-directory-present-fo.patch
0001-Ensure-etc-iproute2-rt_tables.d-directory-present-fo.patch
0002-remove-ifupdown2d-from-setup-py.patch
Loading