diff options
| author | Leah Rowe <info@minifree.org> | 2018-12-10 16:30:32 +0000 |
|---|---|---|
| committer | Gogs <gogitservice@gmail.com> | 2018-12-10 16:30:32 +0000 |
| commit | fa3acdebea3a17f4be0dfb0503939735cd0401b2 (patch) | |
| tree | 247745f46339b2e4823d762751c8bfd096e732ae | |
| parent | 2a94bb22ac1c5aac391da97cc857d2fd2ea8a240 (diff) | |
| parent | 8abe1e9b213bb49756297a60691d7c3ec1061ec7 (diff) | |
| download | librebootfr-fa3acdebea3a17f4be0dfb0503939735cd0401b2.tar.gz librebootfr-fa3acdebea3a17f4be0dfb0503939735cd0401b2.zip | |
Merge branch 'grub-scripts' of and_who/libreboot into master
| -rw-r--r-- | projects/grub/configs/bios/config | 6 | ||||
| -rw-r--r-- | projects/grub/configs/bios/modules-minimal | 2 | ||||
| -rw-r--r-- | projects/grub/configs/coreboot/config | 8 | ||||
| -rw-r--r-- | projects/grub/configs/coreboot/modules-minimal | 1 | ||||
| -rw-r--r-- | projects/grub/configs/uefi/config | 8 | ||||
| -rw-r--r-- | projects/grub/configs/uefi/modules-minimal | 1 |
6 files changed, 12 insertions, 14 deletions
diff --git a/projects/grub/configs/bios/config b/projects/grub/configs/bios/config index 0b4a8d4e..f971795c 100644 --- a/projects/grub/configs/bios/config +++ b/projects/grub/configs/bios/config @@ -1,6 +1,4 @@ -insmod cbfs +set root=(fd0) +set prefix=($root)/boot/grub -set prefix=(cbfsdisk)/fallback - -set root=(cbfsdisk) source (cbfsdisk)/fallback/grub.cfg diff --git a/projects/grub/configs/bios/modules-minimal b/projects/grub/configs/bios/modules-minimal index 6cb1d499..604b8091 100644 --- a/projects/grub/configs/bios/modules-minimal +++ b/projects/grub/configs/bios/modules-minimal @@ -1,4 +1,5 @@ ahci +biosdisk cbfs cbmemc configfile @@ -7,6 +8,7 @@ ext2 halt loadenv memdisk +minicmd part_bsd part_gpt pata diff --git a/projects/grub/configs/coreboot/config b/projects/grub/configs/coreboot/config index 0b4a8d4e..f5d969f9 100644 --- a/projects/grub/configs/coreboot/config +++ b/projects/grub/configs/coreboot/config @@ -1,6 +1,4 @@ -insmod cbfs - -set prefix=(cbfsdisk)/fallback - set root=(cbfsdisk) -source (cbfsdisk)/fallback/grub.cfg +set prefix=($root)/fallback + +source $prefix/grub.cfg diff --git a/projects/grub/configs/coreboot/modules-minimal b/projects/grub/configs/coreboot/modules-minimal index e2033cb8..f67c1dcc 100644 --- a/projects/grub/configs/coreboot/modules-minimal +++ b/projects/grub/configs/coreboot/modules-minimal @@ -6,6 +6,7 @@ ehci ext2 halt loadenv +minicmd part_bsd part_gpt pata diff --git a/projects/grub/configs/uefi/config b/projects/grub/configs/uefi/config index 0b4a8d4e..f5d969f9 100644 --- a/projects/grub/configs/uefi/config +++ b/projects/grub/configs/uefi/config @@ -1,6 +1,4 @@ -insmod cbfs - -set prefix=(cbfsdisk)/fallback - set root=(cbfsdisk) -source (cbfsdisk)/fallback/grub.cfg +set prefix=($root)/fallback + +source $prefix/grub.cfg diff --git a/projects/grub/configs/uefi/modules-minimal b/projects/grub/configs/uefi/modules-minimal index e2033cb8..f67c1dcc 100644 --- a/projects/grub/configs/uefi/modules-minimal +++ b/projects/grub/configs/uefi/modules-minimal @@ -6,6 +6,7 @@ ehci ext2 halt loadenv +minicmd part_bsd part_gpt pata |