This commit does removes the assumption of a boot folder (/boot) just for grub setup #1920
Conversation
There was a problem hiding this comment.
I think the main issue was a missing grub.cfg in EFI partition while creating the ISO, however I did some more changes in order to simplify the setup as was getting a bit confused by unused variables and duplicated variables (bootDir and efiDir were always the same and not really properly distinguished).
In the future we can probably argue if it is needed a more standard setup in EFI that acually looks more like traditional installation:
/EFI/BOOT/<efi binaries and small static grub.cfg>
/EFI/ELEMENTAL/<efi binaries and small static grub.cfg>
/grub2/<the actual grub.cfg and grub modules>
/<kernel and initrd for systemdboot or ISOs>
| @@ -187,27 +186,30 @@ func (b *BuildISOAction) ISORun() error { | |||
| } | |||
|
|
|||
| func (b *BuildISOAction) PrepareEFI(rootDir, uefiDir string) error { | |||
| return b.bootloader.InstallEFIFallbackBinaries(rootDir, uefiDir, b.spec.Label) | |||
| err := b.renderGrubTemplate(uefiDir) | |||
There was a problem hiding this comment.
EFI partition was missing the grub.cfg, included in the ISO filesystem but not in the EFI (vfat) filesystem.
| } | ||
|
|
||
| func (b *BuildISOAction) PrepareISO(rootDir, imageDir string) error { | ||
| err := utils.MkdirAll(b.cfg.Fs, filepath.Join(imageDir, grubPrefixDir), constants.DirPerm) | ||
| // Include EFI contents in iso root too | ||
| return b.PrepareEFI(rootDir, imageDir) |
There was a problem hiding this comment.
With this commit PrepareEFI and PrepareISO are just identical, both simply prepare EFI bootloader. One is used while booting as an ISO and the other while booting the ISO as a disk (dd ISO to a raw image and boot it as a disk)
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## main #1920 +/- ##
==========================================
+ Coverage 73.91% 73.92% +0.01%
==========================================
Files 71 71
Lines 7762 7750 -12
==========================================
- Hits 5737 5729 -8
+ Misses 1600 1597 -3
+ Partials 425 424 -1 ☔ View full report in Codecov by Sentry. |
| @@ -17,12 +17,11 @@ limitations under the License. | |||
| package v1 | |||
|
|
|||
| type Bootloader interface { | |||
| Install(rootDir, bootDir, deviceLabel string) (err error) | |||
There was a problem hiding this comment.
Device label was completely unused
| InstallConfig(rootDir, bootDir string) error | ||
| DoEFIEntries(shimName, efiDir string) error | ||
| InstallEFI(rootDir, bootDir, efiDir, deviceLabel string) error |
There was a problem hiding this comment.
bootDir and efiDir were set always to the same value and the code is not really prepared to properly use them as different concepts.
With this commit all grub binaries (EFI images and modules) and configurations are installed always in defined prefixes. Defined prefixes are always appended to the EFI path, which is usually the EFI partition mountpoint at run time. This causes a duplication of data if multiple prefixes are defined. Signed-off-by: David Cassany <dcassany@suse.com>
0dcf81b to
91ba5f9
Compare
With this commit all grub binaries (EFI images and modules) and configurations are installed always in defined prefixes.
Defined prefixes are always appended to the EFI path, which is usually the EFI partition mountpoint at run time.
This causes a duplication of data if multiple prefixes are defined.
In addition this commit also removes unused variables.