Merge branch 'next' into temp-c165-development

2026-04-13 04:22:58 +02:00 · 2022-02-10 17:14:58 +00:00
parent e04aed385f 816b0e08c6
commit cbf627c47e
4 changed files with 6 additions and 4 deletions
--- a/config/rootfiles/common/x86_64/intel-microcode
+++ b/config/rootfiles/common/x86_64/intel-microcode
@@ -86,8 +86,6 @@ lib/firmware/intel-ucode/06-6a-06
 lib/firmware/intel-ucode/06-7a-01
 lib/firmware/intel-ucode/06-7a-08
 lib/firmware/intel-ucode/06-7e-05
-lib/firmware/intel-ucode/06-86-04
-lib/firmware/intel-ucode/06-86-05
 lib/firmware/intel-ucode/06-8a-01
 lib/firmware/intel-ucode/06-8c-01
 lib/firmware/intel-ucode/06-8c-02
--- a/config/rootfiles/oldcore/164/filelists/x86_64/intel-microcode
+++ b/config/rootfiles/oldcore/164/filelists/x86_64/intel-microcode
@@ -0,0 +1 @@
+../../../../common/x86_64/intel-microcode
--- a/lfs/intel-microcode
+++ b/lfs/intel-microcode
@@ -24,7 +24,7 @@

 include Config

-VER        = 20210608
+VER        = 20220207

 THISAPP    = Intel-Linux-Processor-Microcode-Data-Files-microcode-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -41,7 +41,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 769cab71e957b83121a1f4a07f1c4409
+$(DL_FILE)_MD5 = 7ac3ef4212c41b8b1f555f87e07d6c66

 install : $(TARGET)

--- a/src/initscripts/system/firewall
+++ b/src/initscripts/system/firewall
@@ -39,6 +39,9 @@ iptables_init() {
 	iptables -P FORWARD DROP
 	iptables -P OUTPUT ACCEPT

+	# Ensure the xt_geoip module is always loaded (#12767)
+	modprobe xt_geoip
+
 	# Enable TRACE logging to syslog
 	modprobe nf_log_ipv4
 	sysctl -q -w net.netfilter.nf_log.2=nf_log_ipv4