From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 1 Dec 2019 15:36:43 +0000 (+0100)
Subject: Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
X-Git-Tag: v2.23-core139~3^2~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=941520c69cf5bf50c3c737f47b27ccb28a73a746;p=ipfire-2.x.git

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

941520c69cf5bf50c3c737f47b27ccb28a73a746
diff --cc config/rootfiles/core/139/filelists/files
index 8557affaa5,a08d12e20c..7a05c13fe6
--- a/config/rootfiles/core/139/filelists/files
+++ b/config/rootfiles/core/139/filelists/files
@@@ -5,15 -5,12 +5,16 @@@ var/ipfire/lang
  etc/httpd/conf/vhosts.d/ipfire-interface.conf
  etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf
  etc/rc.d/init.d/functions
+ etc/rc.d/init.d/networking/dhcpcd.exe
  etc/rc.d/init.d/networking/red
  etc/rc.d/init.d/networking/functions.network
 +etc/rc.d/init.d/networking/red.down/99-beep
  etc/rc.d/init.d/networking/red.up/23-suricata
 +etc/rc.d/init.d/networking/red.up/99-beep
  etc/rc.d/init.d/unbound
  etc/suricata/suricata.yaml
 +etc/ppp/ip-down
 +etc/ppp/ip-up
  srv/web/ipfire/cgi-bin/captive.cgi
  srv/web/ipfire/cgi-bin/ids.cgi
  srv/web/ipfire/cgi-bin/mail.cgi