From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] network-hotplug-vlan: Fix for bug 12676
Date: Mon, 29 Jul 2024 16:01:12 +0200
Message-ID: <20240729140112.3429563-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1425269880982003311=="
List-Id: <development.lists.ipfire.org>

--===============1425269880982003311==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

- https://bugzilla.ipfire.org/show_bug.cgi?id=3D12676#c3

Suggested-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 config/udev/network-hotplug-vlan | 42 +++++++++++++++-----------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/config/udev/network-hotplug-vlan b/config/udev/network-hotplug-v=
lan
index 178e1a67b..07ae5a61c 100644
--- a/config/udev/network-hotplug-vlan
+++ b/config/udev/network-hotplug-vlan
@@ -1,25 +1,23 @@
 #!/bin/bash
-############################################################################
-#                                                                          #
-# This file is part of the IPFire Firewall.                                #
-#                                                                          #
-# IPFire is free software; you can redistribute it and/or modify           #
-# it under the terms of the GNU General Public License as published by     #
-# the Free Software Foundation; either version 2 of the License, or        #
-# (at your option) any later version.                                      #
-#                                                                          #
-# IPFire is distributed in the hope that it will be useful,                #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
-# GNU General Public License for more details.                             #
-#                                                                          #
-# You should have received a copy of the GNU General Public License        #
-# along with IPFire; if not, write to the Free Software                    #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
-#                                                                          #
-# Copyright (C) 2015 IPFire Team <info(a)ipfire.org>                        =
 #
-#                                                                          #
-############################################################################
+############################################################################=
###
+#                                                                           =
  #
+# IPFire.org - A linux based firewall                                       =
  #
+# Copyright (C) 2015-2024  IPFire Team  <info(a)ipfire.org>                 =
    #
+#                                                                           =
  #
+# This program is free software: you can redistribute it and/or modify      =
  #
+# it under the terms of the GNU General Public License as published by      =
  #
+# the Free Software Foundation, either version 3 of the License, or         =
  #
+# (at your option) any later version.                                       =
  #
+#                                                                           =
  #
+# This program is distributed in the hope that it will be useful,           =
  #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of            =
  #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             =
  #
+# GNU General Public License for more details.                              =
  #
+#                                                                           =
  #
+# You should have received a copy of the GNU General Public License         =
  #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.     =
  #
+#                                                                           =
  #
+############################################################################=
###
=20
 [ -n "${INTERFACE}" ] || exit 2
=20
@@ -62,7 +60,7 @@ for interface in green0 red0 blue0 orange0; do
=20
 	# If the parent device (MAC or name) does not match the interface that
 	# has just come up, we will go on for the next one.
-	[ "${PARENT_DEV}" =3D "${INTERFACE}" ] || [ "${PARENT_DEV}" =3D "$(</sys/cl=
ass/net/${INTERFACE}/address)" ] || continue
+	[ "${PARENT_DEV}" =3D "${INTERFACE}" -o "${PARENT_DEV}" =3D "$(</sys/class/=
net/${INTERFACE}/address)" ] || continue
=20
 	# If the current zone is operating in bridge mode, give the VLAN interface =
a generic name (e.g. eth0.99 for VLAN 99 on eth0)
 	if [ "${ZONE_MODE}" =3D "bridge" ]; then
--=20
2.45.2


--===============1425269880982003311==--