From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 11 May 2015 12:53:38 +0000 (+0200)
Subject: core90: Remove old udev configuration
X-Git-Tag: v2.17-core91~30^2^2~20
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=51ff5115a0d7e8b5ea99d8a0b1aaac1823487304

core90: Remove old udev configuration

This is not used any more and must be removed with the
update so that the new script is taking effect.
---

diff --git a/config/rootfiles/core/90/exclude b/config/rootfiles/core/90/exclude
index 56e840d8cc..73b7b73e63 100644
--- a/config/rootfiles/core/90/exclude
+++ b/config/rootfiles/core/90/exclude
@@ -15,7 +15,6 @@ etc/sudoers
 etc/sysconfig/firewall.local
 etc/sysconfig/modules
 etc/sysconfig/rc.local
-etc/udev/rules.d/30-persistent-network.rules
 srv/web/ipfire/html/proxy.pac
 var/ipfire/firewall/geoipblock
 var/ipfire/fwhosts/custmgeoipgrp
diff --git a/config/rootfiles/core/90/update.sh b/config/rootfiles/core/90/update.sh
index 4835c5a29c..52a8a8c757 100644
--- a/config/rootfiles/core/90/update.sh
+++ b/config/rootfiles/core/90/update.sh
@@ -208,6 +208,9 @@ sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi
 # Update Language cache
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 
+# Remove old udev configuration
+rm -vf /etc/udev/rules.d/30-persistent-network.rules
+
 #
 # Start services
 #