installers: grub2 timeout everywhere - #2505
Conversation
When `installer.bootloader.grub2.menu-timeout` is set in the blueprint make sure it applies to *all* installer types. Signed-off-by: Simon de Vlieger <cmdr@supakeen.com>
| // Default Grub2 menu on the ISO | ||
| DefaultMenu int | ||
| // Default Grub2 menu timeout on the ISO | ||
| MenuTimeout *int |
There was a problem hiding this comment.
FWIW I have this as part of PR #2414 where I just used an int and compare with 0, the same way we do for DefaultMenu.
There was a problem hiding this comment.
Yea but I think for the timeout 0 is a valid value; while it isn't for DefaultMenu?
There was a problem hiding this comment.
Hrm, now that I re-read the docs I guess so (I just hate to see new pointers introduced). 0 == boot now, -1 == wait forever. Default is 5s without it set at all. I guess I'll have to change #2414 then.
There was a problem hiding this comment.
Ok, went to fix this and realized why I did it that way in the first place. The stages use omitempty so 0 isn't a valid setting. The osbuild code has its own defaults when it isn't set (60s for grub2.iso and legacy, 0 for the non-iso grub stages. So I used a non-pointer int and 0 to be consistent with this.
When
installer.bootloader.grub2.menu-timeoutis set in the blueprint make sure it applies to all installer types. Closes #2223.