From: Arne Fitzenreiter Date: Sat, 12 Aug 2023 14:48:54 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/master' into next X-Git-Tag: v2.27-core179~9^2~19 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cd7836340471b3455884b11b6a5955288714579d;p=ipfire-2.x.git Merge remote-tracking branch 'origin/master' into next Signed-off-by: Arne Fitzenreiter --- cd7836340471b3455884b11b6a5955288714579d diff --cc config/rootfiles/oldcore/178/exclude index 0000000000,0000000000..8ee1c3c2f5 new file mode 100644 --- /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 0000000000,3a2532bc7d..3a2532bc7d mode 000000,120000..120000 --- a/config/rootfiles/oldcore/178/filelists/aarch64/linux +++ b/config/rootfiles/oldcore/178/filelists/aarch64/linux diff --cc config/rootfiles/oldcore/178/filelists/aarch64/u-boot-mkimage index 0000000000,8606a8983b..8606a8983b mode 000000,120000..120000 --- a/config/rootfiles/oldcore/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 0000000000,0000000000..0dec37e538 new file mode 100644 --- /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 0000000000,957d268c9f..957d268c9f mode 000000,100644..100644 --- a/config/rootfiles/oldcore/178/filelists/files +++ b/config/rootfiles/oldcore/178/filelists/files diff --cc config/rootfiles/oldcore/178/filelists/linux-firmware-update index 0000000000,21e8e86028..21e8e86028 mode 000000,100644..100644 --- a/config/rootfiles/oldcore/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 0000000000,d5ac074e2e..d5ac074e2e mode 000000,120000..120000 --- a/config/rootfiles/oldcore/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 0000000000,0615b5b9ad..0615b5b9ad mode 000000,120000..120000 --- a/config/rootfiles/oldcore/178/filelists/x86_64/linux +++ b/config/rootfiles/oldcore/178/filelists/x86_64/linux diff --cc config/rootfiles/oldcore/178/update.sh index 0000000000,caa15bee79..caa15bee79 mode 000000,100644..100644 --- a/config/rootfiles/oldcore/178/update.sh +++ b/config/rootfiles/oldcore/178/update.sh