Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next

diff --git a/config/dracut/dracut.conf b/config/dracut/dracut.conf
index 52bba9c6294eee6532d1f1d54a7fe1abe26bcca8..e9bd566b64035a979f5f0635c671838fdee0f6dd 100644 (file)
--- a/config/dracut/dracut.conf
+++ b/config/dracut/dracut.conf
@@ -31,6 +31,9 @@ filesystems+="reiserfs vfat xfs"
 #hostonly="yes"
 #
 
+# Load microcode for the CPU early
+early_microcode=yes
+
 # install local /etc/mdadm.conf
 #mdadmconf="no"
 

diff --git a/config/rootfiles/core/123/update.sh b/config/rootfiles/core/123/update.sh
index cf488ec49ec5bde6a48d89ec03de1ade920fbe0d..76eff74bb349571a884204cf62327c0ecdcad7a9 100644 (file)
--- a/config/rootfiles/core/123/update.sh
+++ b/config/rootfiles/core/123/update.sh
@@ -51,6 +51,9 @@ ldconfig
 /etc/init.d/unbound restart
 /etc/init.d/squid start
 
+# rebuild initrd to add early microcode updates
+rebuild-initrd
+
 # This update needs a reboot...
 touch /var/run/need_reboot
 

diff --git a/lfs/cdrom b/lfs/cdrom
index 6382034b54f4c76063e19bf0b30f8b312641a742..08bd609c478652957486672d914c391e3e391a68 100644 (file)
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -84,7 +84,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        dd if=/dev/zero  bs=1k count=2            > /install/cdrom/boot/isolinux/boot.catalog
 ifneq "$(BUILD_PLATFORM)" "arm"
        cp /boot/vmlinuz-$(KVER)-ipfire             /install/cdrom/boot/isolinux/vmlinuz
-       dracut --force -a "installer" --strip --xz /install/cdrom/boot/isolinux/instroot $(KVER)-ipfire
+       dracut --force --early-microcode -a "installer" --strip --xz /install/cdrom/boot/isolinux/instroot $(KVER)-ipfire
        cp $(DIR_SRC)/config/syslinux/boot.png      /install/cdrom/boot/isolinux/boot.png
        cp /usr/lib/memtest86+/memtest.bin          /install/cdrom/boot/isolinux/memtest
        cp /usr/share/ipfire-netboot/ipxe.lkrn      /install/cdrom/boot/isolinux/netboot

diff --git a/lfs/linux b/lfs/linux
index c5d8a8e88fc19a2bf8d5c5c3209cee026136311f..b5877fc5bec991be4dd9a50ff1d9b9d03250ca0b 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -34,7 +34,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-PAK_VER    = 75
+PAK_VER    = 76
 DEPS      = ""
 
 KERNEL_ARCH   = $(BUILD_ARCH)

diff --git a/lfs/linux-initrd b/lfs/linux-initrd
index 1e6b071f99b378b8361f1c8d36473e7dedcab585..93f21078ea06d8514eb2d2f55f166c1b8bc64493 100644 (file)
--- a/lfs/linux-initrd
+++ b/lfs/linux-initrd
@@ -62,7 +62,7 @@ ifneq "$(KCFG)" "-rpi"
 ifneq "$(KCFG)" "-pae"
 
        # Create initramfs images
-       dracut --force --verbose --strip --xz /boot/initramfs-$(KVER)-$(VERSUFIX).img $(KVER)-$(VERSUFIX)
+       dracut --force --early-microcode --verbose --strip --xz /boot/initramfs-$(KVER)-$(VERSUFIX).img $(KVER)-$(VERSUFIX)
 
 ifeq "$(KCFG)" "-kirkwood"
 #      cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(VERSUFIX)

diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh
index e5f82c567fd4747ee9ce33500e1b08b536b7bc4e..fd71621d5752430293127c70c2a280a0dbcf2053 100644 (file)
--- a/src/paks/linux-pae/install.sh
+++ b/src/paks/linux-pae/install.sh
@@ -60,7 +60,7 @@ depmod -a $KVER-ipfire-pae
 #
 # Made initramdisk
 #
-/usr/bin/dracut --force --xz /boot/initramfs-$KVER-ipfire-pae.img $KVER-ipfire-pae  
+/usr/bin/dracut --force --early-microcode --xz /boot/initramfs-$KVER-ipfire-pae.img $KVER-ipfire-pae  
 
 if [ -e /boot/grub/grub.cfg ]; then
        #

diff --git a/src/scripts/rebuild-initrd b/src/scripts/rebuild-initrd
index 06f30bbf05c31d71d64795c548c6d7e272e7e3e5..91e68ca571b2bc0a189dabfd62017c43111ebce1 100644 (file)
--- a/src/scripts/rebuild-initrd
+++ b/src/scripts/rebuild-initrd
@@ -24,4 +24,4 @@
 #
 KVER=`uname -r | cut -d"-" -f1`
 
-dracut --force --verbose /boot/ipfirerd-$KVER.img $KVER-ipfire
+dracut --force --early-microcode --verbose /boot/ipfirerd-$KVER.img $KVER-ipfire