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

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

diff --cc config/rootfiles/oldcore/178/exclude
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..8ee1c3c2f5dd1342776cdf93b499715309a5589a
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/config/rootfiles/oldcore/178/exclude
@@@ -1,0 -1,0 +1,35 @@@
++boot/config.txt
++boot/grub/grub.cfg
++boot/grub/grubenv
++boot/uEnv.txt
++etc/alternatives
++etc/collectd.custom
++etc/default/grub
++etc/ipsec.conf
++etc/ipsec.secrets
++etc/ipsec.user.conf
++etc/ipsec.user.secrets
++etc/localtime
++etc/shadow
++etc/snort/snort.conf
++etc/ssl/openssl.cnf
++etc/sudoers
++etc/sysconfig/firewall.local
++etc/sysconfig/rc.local
++etc/udev/rules.d/30-persistent-network.rules
++srv/web/ipfire/html/proxy.pac
++var/ipfire/dma
++var/ipfire/time
++var/ipfire/firewall/locationblock
++var/ipfire/fwhosts/customlocationgrp
++var/ipfire/ovpn
++var/ipfire/urlfilter/blacklist
++var/ipfire/urlfilter/settings
++var/lib/alternatives
++var/lib/location/database.db
++var/lib/location/ipset
++var/log/cache
++var/log/dhcpcd.log
++var/log/messages
++var/state/dhcp/dhcpd.leases
++var/updatecache

diff --cc config/rootfiles/oldcore/178/filelists/aarch64/linux
index 0000000000000000000000000000000000000000,3a2532bc7dcfc9da50d86121d20e866649b87db3..3a2532bc7dcfc9da50d86121d20e866649b87db3
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/178/filelists/aarch64/linux
+++ b/config/rootfiles/oldcore/178/filelists/aarch64/linux

diff --cc config/rootfiles/oldcore/178/filelists/aarch64/u-boot-mkimage
index 0000000000000000000000000000000000000000,8606a8983b5c2a14d060a305aff34155dfdcc600..8606a8983b5c2a14d060a305aff34155dfdcc600
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/178/filelists/aarch64/u-boot-mkimage
+++ b/config/rootfiles/oldcore/178/filelists/aarch64/u-boot-mkimage

diff --cc config/rootfiles/oldcore/178/filelists/core-files
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..0dec37e538bdd064e86521c43e07b10dd1970f55
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/config/rootfiles/oldcore/178/filelists/core-files
@@@ -1,0 -1,0 +1,5 @@@
++etc/system-release
++etc/issue
++etc/os-release
++srv/web/ipfire/cgi-bin/credits.cgi
++var/ipfire/langs

diff --cc config/rootfiles/oldcore/178/filelists/files
index 0000000000000000000000000000000000000000,957d268c9f1c430a921dae978b31976e49c4cf23..957d268c9f1c430a921dae978b31976e49c4cf23
mode 000000,100644..100644
--- /dev/null
--- 2/config/rootfiles/core/178/filelists/files
+++ b/config/rootfiles/oldcore/178/filelists/files

diff --cc config/rootfiles/oldcore/178/filelists/linux-firmware-update
index 0000000000000000000000000000000000000000,21e8e86028de0b75f70f7a6a141ba5f8f82aaf1d..21e8e86028de0b75f70f7a6a141ba5f8f82aaf1d
mode 000000,100644..100644
--- /dev/null
--- 2/config/rootfiles/core/178/filelists/linux-firmware-update
+++ b/config/rootfiles/oldcore/178/filelists/linux-firmware-update

diff --cc config/rootfiles/oldcore/178/filelists/x86_64/intel-microcode
index 0000000000000000000000000000000000000000,d5ac074e2eee75bd7f0860ede7b07e76d746cc04..d5ac074e2eee75bd7f0860ede7b07e76d746cc04
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/178/filelists/x86_64/intel-microcode
+++ b/config/rootfiles/oldcore/178/filelists/x86_64/intel-microcode

diff --cc config/rootfiles/oldcore/178/filelists/x86_64/linux
index 0000000000000000000000000000000000000000,0615b5b9ad53f8af33b76b63e087941e7b64c36c..0615b5b9ad53f8af33b76b63e087941e7b64c36c
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/178/filelists/x86_64/linux
+++ b/config/rootfiles/oldcore/178/filelists/x86_64/linux

diff --cc config/rootfiles/oldcore/178/update.sh
index 0000000000000000000000000000000000000000,caa15bee7941c4624a0edf16b02cd6e312ce102f..caa15bee7941c4624a0edf16b02cd6e312ce102f
mode 000000,100644..100644
--- /dev/null
--- 2/config/rootfiles/core/178/update.sh
+++ b/config/rootfiles/oldcore/178/update.sh

diff --cc make.sh
Simple merge