Merge remote-tracking branch 'origin/master' into core124

diff --git a/config/rootfiles/core/124/filelists/aarch64/files b/config/rootfiles/core/124/filelists/aarch64/files-aarch64
similarity index 100%
rename from config/rootfiles/core/124/filelists/aarch64/files
rename to config/rootfiles/core/124/filelists/aarch64/files-aarch64

diff --git a/config/rootfiles/core/124/filelists/armv5tel/files b/config/rootfiles/core/124/filelists/armv5tel/files-armv5tel
similarity index 100%
rename from config/rootfiles/core/124/filelists/armv5tel/files
rename to config/rootfiles/core/124/filelists/armv5tel/files-armv5tel

diff --git a/config/rootfiles/core/124/update.sh b/config/rootfiles/core/124/update.sh
index b65bc52b8ed8e792934c6c5740171607f71f24d1..b1b8623786caacb320e7276aa3833f12f8b6b668 100644 (file)
--- a/config/rootfiles/core/124/update.sh
+++ b/config/rootfiles/core/124/update.sh
@@ -106,16 +106,15 @@ ldconfig
 # Reload sysctl.conf
 sysctl -p
 
-# rebuild initrd to add early microcode updates
-rebuild-initrd
-
 # Remove deprecated GRUB configuration option
 if [ -e "/etc/default/grub" ]; then
        sed -e "/^GRUB_FONT/d" -i /etc/default/grub
 fi
 
 # Update bootloader
+if [ -e /usr/bin/install-bootloader ]; then
 /usr/bin/install-bootloader
+fi
 
 # Upadate Kernel version uEnv.txt
 if [ -e /boot/uEnv.txt ]; then