Merge remote-tracking branch 'origin/master' into next

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --cc config/rootfiles/core/180/filelists/files
index 616b2d24a0e69102fc9329e0b18ed387d39faab6,0000000000000000000000000000000000000000..8b44a36b1a3860601181c7040d1174181b7ef92f
mode 100644,000000..100644
--- 1/config/rootfiles/core/180/filelists/files
--- /dev/null
+++ b/config/rootfiles/core/180/filelists/files
@@@ -1,9 -1,0 +1,11 @@@
 +etc/logrotate.conf
 +etc/rc.d/init.d/network
 +etc/rc.d/init.d/networking/any
 +etc/rc.d/init.d/networking/functions.network
 +etc/rc.d/init.d/networking/red
 +etc/rc.d/init.d/networking/red.up/99-pakfire-update
++lib/udev/rules.d/61-extrahd.rules
 +opt/pakfire/lib/functions.pl
++srv/web/ipfire/cgi-bin/extrahd.cgi
 +srv/web/ipfire/cgi-bin/index.cgi
 +var/ipfire/main/manualpages

diff --cc config/rootfiles/oldcore/179/filelists/files
Simple merge

diff --cc lfs/udev
Simple merge