bootloader: use ForGadget when installing boot config #9643
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Address TODO added during UC20 development and use a ForGadget helper when installing boot configs of a bootloader. Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
anonymouse64
approved these changes
Nov 13, 2020
bootloader/bootloader.go
Outdated
Comment on lines
99
to
100
| // given gadgetDir to rootdir. If no boot config for this bootloader | ||
| // is found ok is false. |
There was a problem hiding this comment.
Suggested change
| // given gadgetDir to rootdir. If no boot config for this bootloader | |
| // is found ok is false. | |
| // given gadgetDir to rootdir. |
Comment on lines
+249
to
+251
| bl, err := ForGadget(gadgetDir, rootDir, opts) | ||
| if err != nil { | ||
| return fmt.Errorf("cannot find boot config in %q", gadgetDir) |
There was a problem hiding this comment.
ah nice, this does look much better, thanks
image/image_test.go
Outdated
| @@ -2642,28 +2641,32 @@ func (s *imageSuite) TestSetupSeedCore20(c *C) { | |||
|
|
|||
| // check boot config | |||
| grubCfg := filepath.Join(prepareDir, "system-seed", "EFI/ubuntu/grub.cfg") | |||
| seedGrubenv := filepath.Join(prepareDir, "system-seed", "EFI/ubuntu/grubenv") | |||
| grubRecoveryCfgAsset := assets.Internal("grub-recovery.cfg") | |||
| c.Assert(grubRecoveryCfgAsset, NotNil) | |||
| c.Check(grubCfg, testutil.FileEquals, string(grubRecoveryCfgAsset)) | |||
| // make sure that grub.cfg is the only file present inside the directory | |||
There was a problem hiding this comment.
Suggested change
| // make sure that grub.cfg is the only file present inside the directory | |
| // make sure that grub.cfg and grubenv are the only files present inside the directory |
…tloader-install-boot-config-cleanup
Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
mvo5
approved these changes
Nov 16, 2020
Comment on lines
+249
to
+251
| bl, err := ForGadget(gadgetDir, rootDir, opts) | ||
| if err != nil { | ||
| return fmt.Errorf("cannot find boot config in %q", gadgetDir) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Address TODO added during UC20 development and use a ForGadget helper when
installing boot configs of a bootloader.