Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6980edf2ba71
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 290505bf1bb8
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on May 13, 2018

  1. nixos/grub: Updates splashImage description to match reality. 

    Fixes #4911
    @samueldr
    samueldr committed May 13, 2018
    Copy the full SHA
    8f3a541 View commit details

  2. nixos/grub: Implements use of file format for splashImage. 

    GRUB 2.0 supports png, jpeg and tga. This will use the image's suffix to
load the right module.

As jpeg module is named jpeg, jpg is renamed jpeg.

If the user uses wrong image suffix for an image, it wouldn't work anyway.

This will leave up to two additional left-over files in /boot/ if user switches
through all the supported file formats. The module already left the png
image if the user disabled the splash image.
    @samueldr
    samueldr committed May 13, 2018
    Copy the full SHA
    0ccfe14 View commit details

Commits on May 24, 2018

  1. Merge pull request #40462 from samueldr/fix/grub-background 

    Fixes grub splashImage documentation + implementation
    @grahamc
    grahamc authored May 24, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    290505b View commit details
Showing with 24 additions and 8 deletions.
  1. +15 −3 nixos/modules/system/boot/loader/grub/grub.nix
  2. +9 −5 nixos/modules/system/boot/loader/grub/install-grub.pl
18 changes: 15 additions & 3 deletions nixos/modules/system/boot/loader/grub/grub.nix
View file
Original file line number Diff line number Diff line change
@@ -308,10 +308,22 @@ in
type = types.nullOr types.path;
example = literalExample "./my-background.png";
description = ''
Background image used for GRUB. It must be a 640x480,
Background image used for GRUB.
Set to <literal>null</literal> to run GRUB in text mode.
<note><para>
For grub 1:
It must be a 640x480,
14-colour image in XPM format, optionally compressed with
<command>gzip</command> or <command>bzip2</command>. Set to
<literal>null</literal> to run GRUB in text mode.
<command>gzip</command> or <command>bzip2</command>.
</para></note>
<note><para>
For grub 2:
File must be one of .png, .tga, .jpg, or .jpeg. JPEG images must
not be progressive.
The image will be scaled if necessary to fit the screen.
</para></note>
'';
};

14 changes: 9 additions & 5 deletions nixos/modules/system/boot/loader/grub/install-grub.pl
View file
Original file line number Diff line number Diff line change
@@ -299,12 +299,16 @@ sub GrubFs {
copy $font, "$bootPath/converted-font.pf2" or die "cannot copy $font to $bootPath\n";
}
if ($splashImage) {
# FIXME: GRUB 1.97 doesn't resize the background image if it
# doesn't match the video resolution.
copy $splashImage, "$bootPath/background.png" or die "cannot copy $splashImage to $bootPath\n";
# Keeps the image's extension.
my ($filename, $dirs, $suffix) = fileparse($splashImage, qr"\..[^.]*$");
# The module for jpg is jpeg.
if ($suffix eq ".jpg") {
$suffix = ".jpeg";
}
copy $splashImage, "$bootPath/background$suffix" or die "cannot copy $splashImage to $bootPath\n";
$conf .= "
insmod png
if background_image " . $grubBoot->path . "/background.png; then
insmod " . substr($suffix, 1) . "
if background_image " . $grubBoot->path . "/background$suffix; then
set color_normal=white/black
set color_highlight=black/white
else