From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 24 Jan 2018 16:07:58 +0000 (+0000)
Subject: Revert "core118: Ship microcode updates for Intel processors"
X-Git-Tag: v2.19-core118~3^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=637eb1eda5f444199c8e7daba5a62726e2d24bd1;p=people%2Fstevee%2Fipfire-2.x.git

Revert "core118: Ship microcode updates for Intel processors"

This reverts commit c015d425d177a18927f56cebd0d1b4d29a827d8b.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/core/118/filelists/files b/config/rootfiles/core/118/filelists/files
index f04bca68ca..f019f2ca91 100644
--- a/config/rootfiles/core/118/filelists/files
+++ b/config/rootfiles/core/118/filelists/files
@@ -12,7 +12,6 @@ srv/web/ipfire/cgi-bin/ids.cgi
 srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat
 srv/web/ipfire/cgi-bin/logs.cgi/urlfilter.dat
 usr/lib/firewall/rules.pl
-usr/local/bin/rebuild-initrd
 usr/local/bin/syslogdctrl
 usr/sbin/updxlrator
 var/ipfire/langs
diff --git a/config/rootfiles/core/118/filelists/i586/intel-microcode b/config/rootfiles/core/118/filelists/i586/intel-microcode
deleted file mode 120000
index f03e84778a..0000000000
--- a/config/rootfiles/core/118/filelists/i586/intel-microcode
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/i586/intel-microcode
\ No newline at end of file
diff --git a/config/rootfiles/core/118/filelists/x86_64/intel-microcode b/config/rootfiles/core/118/filelists/x86_64/intel-microcode
deleted file mode 120000
index d5ac074e2e..0000000000
--- a/config/rootfiles/core/118/filelists/x86_64/intel-microcode
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/x86_64/intel-microcode
\ No newline at end of file
diff --git a/config/rootfiles/core/118/update.sh b/config/rootfiles/core/118/update.sh
index b30d7b3ac6..49d67f223e 100644
--- a/config/rootfiles/core/118/update.sh
+++ b/config/rootfiles/core/118/update.sh
@@ -63,16 +63,7 @@ ldconfig
 /etc/init.d/snort start
 
 # This update need a reboot...
-touch /var/run/need_reboot
-
-# Rebuild the initrd to include the microcode updates
-rebuild-initrd
-
-# Reload microcode
-modprobe microcode
-if [ -w "/sys/devices/system/cpu/microcode/reload" ];
-	echo 1 > /sys/devices/system/cpu/microcode/reload
-fi
+#touch /var/run/need_reboot
 
 # Finish
 /etc/init.d/fireinfo start