Merge branch 'next' into temp-c165-development

diff --git a/config/rootfiles/common/x86_64/intel-microcode b/config/rootfiles/common/x86_64/intel-microcode
index 962590af5ce3e80a8f0706432d96c259146d9919..068cc36d3e6ac5acfed39393893a5b1bc224e376 100644 (file)
--- 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

diff --git a/config/rootfiles/oldcore/164/filelists/x86_64/intel-microcode b/config/rootfiles/oldcore/164/filelists/x86_64/intel-microcode
new file mode 120000 (symlink)
index 0000000..d5ac074
--- /dev/null
+++ b/config/rootfiles/oldcore/164/filelists/x86_64/intel-microcode
@@ -0,0 +1 @@
+../../../../common/x86_64/intel-microcode
\ No newline at end of file

diff --git a/lfs/intel-microcode b/lfs/intel-microcode
index d0a235947604e7dcccd53909782cdbdc0d7d3238..db720b51199e49cbf80fbf45996af8ed84f20fb3 100644 (file)
--- 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)
 

diff --git a/src/initscripts/system/firewall b/src/initscripts/system/firewall
index 7d081bbc36678bbc35a656281b583f41f0ca7bcc..f35b6b6e18a9147e29a0b459ab6e2416a3335e2a 100644 (file)
--- 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