Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-suricata

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>

diff --cc config/backup/include
Simple merge

diff --cc config/rootfiles/common/aarch64/initscripts
Simple merge

diff --cc config/rootfiles/common/armv5tel/initscripts
Simple merge

diff --cc config/rootfiles/common/configroot
Simple merge

diff --cc config/rootfiles/common/i586/initscripts
Simple merge

diff --cc config/rootfiles/common/x86_64/initscripts
Simple merge

diff --cc langs/de/cgi-bin/de.pl
Simple merge

diff --cc langs/en/cgi-bin/en.pl
Simple merge

diff --cc lfs/configroot
index dc73461f101a9e5e5760308ea756d6ae34660687,4701d9e39701ff5ab26bdb58a89b630e128168fd..4f87df3b4cfc2bd18efe2edb7aed234df924be40
--- 1/lfs/configroot
--- 2/lfs/configroot
+++ b/lfs/configroot
@@@ -52,9 -52,9 +52,9 @@@ $(TARGET) 
        # Create all directories
        for i in addon-lang auth backup ca captive certs connscheduler crls ddns dhcp dhcpc dns dnsforward \
                        ethernet extrahd/bin fwlogs fwhosts firewall isdn key langs logging mac main \
-                       menu.d modem nfs optionsfw \
+                       menu.d modem optionsfw \
                        ovpn patches pakfire portfw ppp private proxy/advanced/cre \
 -                      proxy/calamaris/bin qos/bin red remote sensors snort time \
 +                      proxy/calamaris/bin qos/bin red remote sensors suricata time \
                        updatexlrator/bin updatexlrator/autocheck urlfilter/autoupdate urlfilter/bin upnp vpn \
                        wakeonlan wireless ; do \
                mkdir -p $(CONFIG_ROOT)/$$i; \

diff --cc lfs/initscripts
Simple merge

diff --cc make.sh
Simple merge