token2/snapd
0
0
Fork 0
mirror of https://github.com/token2/snapd.git synced 2026-03-13 11:15:47 -07:00
Code Issues Packages Projects Releases Wiki Activity

bootloader/bootloader.go: refactor ForGadget slightly

Browse Source 
Signed-off-by: Ian Johnson <ian.johnson@canonical.com>
This commit is contained in:
Ian Johnson
2020-11-19 15:27:16 -06:00
parent e4ab1c5ca9
commit 072b8847eb
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bootloader/bootloader.go
View File

@@ -366,12 +366,11 @@ func ForGadget(gadgetDir, rootDir string, opts *Options) (Bootloader, error) {
if forcedBootloader != nil || forcedError != nil {
return forcedBootloader, forcedError
}
for _, blNew := range bootloaders {
bl := blNew(rootDir, opts)
markerConf := filepath.Join(gadgetDir, bl.Name()+".conf")
for name, blNew := range bootloaders {
markerConf := filepath.Join(gadgetDir, name+".conf")
// do we have a marker file?
if osutil.FileExists(markerConf) {
return bl, nil
return blNew(rootDir, opts), nil
}
}
return nil, ErrBootloader