Merge branch 'core124' of git.ipfire.org:/pub/git/ipfire-2.x into core124

diff --git a/config/rootfiles/core/124/filelists/files b/config/rootfiles/core/124/filelists/files
index 25e812593956480aff1a58c8cddc8d3b3f87772f..3e7153e12e5cd8a61efd071d4fcb0d0e90eb05a3 100644 (file)
--- a/config/rootfiles/core/124/filelists/files
+++ b/config/rootfiles/core/124/filelists/files
@@ -1,6 +1,8 @@
 etc/system-release
 etc/issue
+etc/nsswitch.conf
 etc/rc.d/helper/aws-setup
+etc/rc.d/init.d/apache
 etc/rc.d/init.d/aws
 etc/rc.d/init.d/localnet
 etc/rc.d/init.d/networking/red.down/10-static-routes

diff --git a/config/rootfiles/core/124/update.sh b/config/rootfiles/core/124/update.sh
index 25a7fd68acab1571da253aabe440f4a560aaeb33..17208b769516ab0a845956020bbfc10e1a32f690 100644 (file)
--- a/config/rootfiles/core/124/update.sh
+++ b/config/rootfiles/core/124/update.sh
@@ -82,9 +82,6 @@ rm -f  /etc/sysconfig/lm_sensors
 # Stop services
 
 # Remove files
-rm -f \
-       /etc/rc.d/rcsysinit.d/S90network-trigger \
-       /etc/rc.d/init.d/network-trigger
 
 # Extract files
 extract_files