Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lib/grub2: Support Debian-style grub.cfg path #1714

Closed
wants to merge 2 commits into from
Closed

lib/grub2: Support Debian-style grub.cfg path #1714

wants to merge 2 commits into from

Conversation

fkrull
Copy link
Contributor

@fkrull fkrull commented Aug 29, 2018

In contrast to... at least Fedora, Debian and Debian-derived systems keep their GRUB configuration file on BIOS systems in /boot/grub/grub.cfg, rather than /boot/grub2/grub.cfg. This patch changes the GRUB detection to look for either of these parts so that GRUB bootloader generation works as expected when doing an ostree admin deploy on a Debian system.

Debian and Debian-derived systems have their GRUB configuration file in
/boot/grub/grub.cfg, rather than /boot/grub2/grub.cfg. Detecting this
file is necessary to correctly generate GRUB boot configuration on
Debian systems.
@papr-bot
Copy link

Can one of the admins verify this patch?

@rh-atomic-bot
Copy link

Can one of the admins verify this patch?
I understand the following commands:

  • bot, add author to whitelist
  • bot, test pull request
  • bot, test pull request once

@cgwalters
Copy link
Member

Thanks for the patch! Offhand, I think this is OK as is, though it might be better as a build-time option? Do you have the autotools-fu to do that?

@fkrull
Copy link
Contributor Author

fkrull commented Sep 1, 2018

A build-time option would also be fine. But adding an option for such a simple check seems overkill to me?

If you prefer the compile option, I can change it. I can probably figure out how to do that with autotools.

@cgwalters
Copy link
Member

Yeah, not worth redoing it. I just pushed a quick fixup! though that adds a comment as to where each version can be found. Thanks for the patch!

@rh-atomic-bot r+ d162ea4

@rh-atomic-bot
Copy link

⌛ Testing commit d162ea4 with merge 74bdf7e...

@rh-atomic-bot
Copy link

☀️ Test successful - status-atomicjenkins
Approved by: cgwalters
Pushing 74bdf7e to master...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants