From: Stefan Schantl Date: Wed, 12 Dec 2018 08:27:59 +0000 (+0100) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-suricata X-Git-Tag: v2.23-core131~117^2~131 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=a13ddf04d9b58ee469b5da6bc0dd5efb64d6ebad Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-suricata Signed-off-by: Stefan Schantl --- a13ddf04d9b58ee469b5da6bc0dd5efb64d6ebad diff --cc lfs/configroot index dc73461f10,4701d9e397..4f87df3b4c --- a/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; \