diff options
| author | Tomasz Maciej Nowak <tmn505@gmail.com> | 2023-01-23 14:44:49 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-02-26 22:22:48 +0100 |
| commit | 909cc6ef5f38fdb65dbbbf67318fbfbe566848c7 (patch) | |
| tree | f07f02547ea87020c51282947378565b4583c730 /target/linux/x86 | |
| parent | be0f1c1b268a99ea25c9797a4ed725835ca79fea (diff) | |
| download | upstream-909cc6ef5f38fdb65dbbbf67318fbfbe566848c7.tar.gz upstream-909cc6ef5f38fdb65dbbbf67318fbfbe566848c7.tar.bz2 upstream-909cc6ef5f38fdb65dbbbf67318fbfbe566848c7.zip | |
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>
Diffstat (limited to 'target/linux/x86')
| -rw-r--r-- | target/linux/x86/base-files/lib/preinit/81_upgrade_bootloader | 18 | ||||
| -rw-r--r-- | target/linux/x86/base-files/lib/upgrade/platform.sh | 3 |
2 files changed, 1 insertions, 20 deletions
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 index 42f04d76a7..0000000000 --- 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 d8f2eba97e..5dad7a538a 100644 --- 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 |