Revert "patch: fix bond mac address at boot."

causes odd issues, reported in the forum [0], so revert before we move
this along to the enterprise repository.

[0]: https://forum.proxmox.com/threads/136359/

Will be replaced by a systemd policy file [1].

[1]: https://lists.proxmox.com/pipermail/pve-devel/2023-September/059129.html

This reverts commit a1a0ee382869f52b66ab67b237138b0375183a9e.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/debian/patches/series b/debian/patches/series
index cff704f51be123b517c7c7d42f0d1bd3577f5c04..1ff8dd4657bad061034040d853d2ec69f2a4820d 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,4 +10,3 @@ pve/0009-gvgeb-fix-python-interpreter-shebang.patch
 upstream/0001-add-ipv6-slaac-support-inet6-auto-accept_ra.patch
 upstream/0001-addons-ethtool-add-rx-vlan-filter.patch
 upstream/0001-scheduler-import-traceback.patch
-upstream/0001-fix-bond-mac.patch
\ No newline at end of file

diff --git a/debian/patches/upstream/0001-fix-bond-mac.patch b/debian/patches/upstream/0001-fix-bond-mac.patch
deleted file mode 100644 (file)
index 79688ac..0000000
--- a/debian/patches/upstream/0001-fix-bond-mac.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 062c3a6707b22cf7494bbf0ccb8ea6559dc334df Mon Sep 17 00:00:00 2001
-From: Alexandre Derumier <alexandre.derumier@groupe-cyllene.com>
-Date: Fri, 1 Sep 2023 09:43:05 +0200
-Subject: [PATCH] bond: fix mac-address on create with first slave mac
-
-since systemd v241, bond (like bridge), are create with a random mac
-instead their first slave.
-
-We already fixing it for bond on reload, but not at create
-
-Than mean that on first reload, we'll always ifdown/ifup interface and change mac.
----
- ifupdown2/addons/bond.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ifupdown2/addons/bond.py b/ifupdown2/addons/bond.py
-index 74d2cab5..5e77e1b0 100644
---- a/ifupdown2/addons/bond.py
-+++ b/ifupdown2/addons/bond.py
-@@ -884,7 +884,7 @@ def _up(self, ifaceobj, ifaceobj_getfunc=None):
-                 ifaceobj_getfunc,
-             )
- 
--            if not self.bond_mac_mgmt or not link_exists or ifaceobj.get_attr_value_first("hwaddress"):
-+            if not self.bond_mac_mgmt or ifaceobj.get_attr_value_first("hwaddress"):
-                 return
- 
-             # check if the bond mac address is correctly inherited from it's