From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 28 Sep 2015 13:35:54 +0000 (+0100)
Subject: core95: Ship changed files
X-Git-Tag: v2.17-core95~65^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=55eb745e65ade706d6ded851086a42f2a1b8803b;p=ipfire-2.x.git

core95: Ship changed files

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/core/95/filelists/files b/config/rootfiles/core/95/filelists/files
index b1e9160886..949c88baac 100644
--- a/config/rootfiles/core/95/filelists/files
+++ b/config/rootfiles/core/95/filelists/files
@@ -1,5 +1,7 @@
 etc/system-release
 etc/issue
+lib/udev/network-hotplug-vlan
+lib/udev/rules.d/60-net.rules
 srv/web/ipfire/cgi-bin/connections.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
 usr/lib/firewall/firewall-lib.pl
diff --git a/config/rootfiles/core/95/update.sh b/config/rootfiles/core/95/update.sh
index 258a62fbc3..388e18d7c2 100644
--- a/config/rootfiles/core/95/update.sh
+++ b/config/rootfiles/core/95/update.sh
@@ -31,6 +31,10 @@ do
 	rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
 done
 
+# Remove files
+rm -f /etc/rc.d/init.d/network-vlans
+rm -f /etc/rc.d/rcsysinit.d/S91network-vlans
+
 # Stop services
 
 # Extract files