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

grub: Support when boot.loader.grub.font is null #41486

Merged
merged 2 commits into from Jun 5, 2018

Conversation

grahamc
Copy link
Member

@grahamc grahamc commented Jun 5, 2018

Motivation for this change

In order for the grub interface to function properly on the serial console provided by some ARM/aarch64 hardware, the background image and font functionality of Grub must not be used.

The grub module's font type supports being nullable, however the code utilizing the font variable did not accept the null option.

The first commit should be backported, fixing the null option. This will mean that a server where the font has always been null, no font will be loaded.

The second commit would be nice to backport, but I would understand if there is hesitation. This commit would fix systems where a font has been copied in to place, but is no longer desirable after setting font to null.

This behavior is modeled after how the background image is handled. Ideally we would also remove the font / background image, but I'm not sure that should be in scope for this fix.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

cc @dezgeg

@grahamc
Copy link
Member Author

grahamc commented Jun 5, 2018

cc @samueldr @aszlig either of you have opinions on this PR &/|| backporting?

Copy link
Member

@aszlig aszlig left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me 👍

@samueldr
Copy link
Member

samueldr commented Jun 5, 2018

With the last fixes, works when backported to 18.03 manually

@grahamc grahamc merged commit 5467f0e into NixOS:master Jun 5, 2018
@grahamc grahamc deleted the support-null-font branch June 5, 2018 17:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants