Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-suricata
authorStefan Schantl <stefan.schantl@ipfire.org>
Wed, 12 Dec 2018 08:27:59 +0000 (09:27 +0100)
committerStefan Schantl <stefan.schantl@ipfire.org>
Wed, 12 Dec 2018 08:27:59 +0000 (09:27 +0100)
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
1  2 
config/backup/include
config/rootfiles/common/aarch64/initscripts
config/rootfiles/common/armv5tel/initscripts
config/rootfiles/common/configroot
config/rootfiles/common/i586/initscripts
config/rootfiles/common/x86_64/initscripts
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl
lfs/configroot
lfs/initscripts
make.sh

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc 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