From: Jonatan Schlag <jonatan.schlag@ipfire.org>
Date: Thu, 29 Dec 2016 19:37:34 +0000 (+0100)
Subject: core109: Ship network bridge changes
X-Git-Tag: v2.19-core109^2~42
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=18b6da69b6e8ecddf86d0f824a28b0f3e37df2cb;p=ipfire-2.x.git

core109: Ship network bridge changes

Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/core/109/filelists/files b/config/rootfiles/core/109/filelists/files
index ca49b1b5e4..7c1cc3f91e 100644
--- a/config/rootfiles/core/109/filelists/files
+++ b/config/rootfiles/core/109/filelists/files
@@ -1,3 +1,6 @@
 etc/system-release
 etc/issue
+lib/udev/rules.d/60-net.rules
+lib/udev/network-hotplug-bridges
+lib/udev/network-hotplug-rename
 usr/local/bin/syslogdctrl
diff --git a/config/rootfiles/core/109/update.sh b/config/rootfiles/core/109/update.sh
index c601654aed..1143890c28 100644
--- a/config/rootfiles/core/109/update.sh
+++ b/config/rootfiles/core/109/update.sh
@@ -50,6 +50,8 @@ ldconfig
 /etc/init.d/squid start
 /etc/init.d/snort start
 
+# Remove old MACVTAP script
+rm -vf /lib/udev/network-hotplug-macvtap
 
 # This update need a reboot...
 #touch /var/run/need_reboot