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 56e840d8cc430f92a45b03e2c122fadc2061050e..73b7b73e630fb896f20e3af5331ebde0476121f5 100644 (file)
--- 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/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
 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 4835c5a29cbec3cfbc4e71eaabd9cf5acfa35da7..52a8a8c757a944ede78d9525ad603d98b7362928 100644 (file)
--- 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"
 
 # 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
 #
 #
 # Start services
 #