#6 Fix linux16 -> initrd16 in 10_linux
Closed 3 years ago by filbranden. Opened 3 years ago by filbranden.
https://github.com/filbranden/grub2-rpm.git initrd16  into  master

Fix linux16 -> initrd16 in 10_linux
Filipe Brandenburger • 3 years ago  
0198-Make-10_linux-work-with-our-changes-for-linux16-and-.patch
file modified
+1 -1
@@ -28,7 +28,7 @@

  +	    initrdcmd=initrdefi

  +	else

  +	    linuxcmd=linux16

- +	    initrdcmd=linux16

+ +	    initrdcmd=initrd16

  +	fi

  +	;;

     esac

grub2.spec
file modified
+6 -1
@@ -7,7 +7,7 @@

  Name:		grub2

  Epoch:		1

  Version:	2.02

- Release:	44%{?dist}

+ Release:	45%{?dist}

  Summary:	Bootloader with support for Linux, Multiboot and more

  Group:		System Environment/Base

  License:	GPLv3+
@@ -479,6 +479,11 @@

  %endif

  

  %changelog

+ * Mon Jul 16 2018 Filipe Brandenburger <filbranden@gmail.com> - 2.02-45

+ - Fix linux16 -> initrd16 in 10_linux, which was accidentally

+   introduced in commit 752ceb1640e8 (2.02-38) rebasing the patches

+   to fedora-29.

+ 

  * Mon Jul 16 2018 Hans de Goede <hdegoede@redhat.com> - 2.02-44

  - Make the user session automatically set the boot_success grubenv flag

  - Make offline-updates increment the boot_indeterminate grubenv variable

no initial comment

Using linux16 for an initramfs.img causes the boot to fail with

error: invalid magic number.

This seems to have been accidentally introduced in commit 752ceb1 (2.02-38) while rebasing the patches to fedora-29.

Tested:
- Regenerated Grub config with grub2-mkconfig, confirmed that initrd16 was used by inspecting grub.cfg, successfully rebooted the system.

cc @pjones

rebased onto a1c7e97

3 years ago

Ping @pjones.

This should fix (at least partially) https://bugzilla.redhat.com/show_bug.cgi?id=1601578, it's an obvious typo...

Pull-Request has been closed by filbranden

3 years ago