x86: remove bootloader upgrade from preinit

This hack was to bring all existing installations to the newest GRUB
version as fast as possible. Since 19.07.x is EoL we can assume this
task is completed. Now sysupgrade will solely be responsible for
bootloader upgrade.

Signed-off-by: Tomasz Maciej Nowak <tmn505@gmail.com>

diff --git a/target/linux/x86/base-files/lib/preinit/81_upgrade_bootloader b/target/linux/x86/base-files/lib/preinit/81_upgrade_bootloader
deleted file mode 100644 (file)
index 42f04d7..0000000
--- a/target/linux/x86/base-files/lib/preinit/81_upgrade_bootloader
+++ /dev/null
@@ -1,18 +0,0 @@
-upgrade_bootloader() {
-       local diskdev
-
-       . /lib/upgrade/common.sh
-
-       if [ ! -f /boot/grub/upgraded ] && export_bootdevice && export_partdevice diskdev 0; then
-               part_magic_efi "/dev/$diskdev" && return 0
-               echo "(hd0) /dev/$diskdev" > /tmp/device.map
-               /usr/sbin/grub-bios-setup \
-                       -m "/tmp/device.map" \
-                       -d "/boot/grub" \
-                       -r "hd0,msdos1" \
-                       "/dev/$diskdev" \
-               && touch /boot/grub/upgraded
-       fi
-}
-
-[ "$INITRAMFS" = "1" ] || boot_hook_add preinit_main upgrade_bootloader

diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh
index d8f2eba97ecbab9c18ddd82ba4a37a37485896f4..5dad7a538a597bfb5fd77874f5c2da174c661318 100644 (file)
--- a/target/linux/x86/base-files/lib/upgrade/platform.sh
+++ b/target/linux/x86/base-files/lib/upgrade/platform.sh
@@ -62,8 +62,7 @@ platform_do_bootloader_upgrade() {
                        -m "/tmp/device.map" \
                        -d "/tmp/boot/boot/grub" \
                        -r "hd0,${parttable}1" \
-                       "/dev/$diskdev" \
-               && touch /tmp/boot/boot/grub/upgraded
+                       "/dev/$diskdev"
 
                umount /tmp/boot
        fi