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
base: d4d9d9c552a7
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: d676d5d11988
Choose a head ref
  • 5 commits
  • 2 files changed
  • 1 contributor

Commits on Jul 6, 2020

  1. install-grub.pl: Refactor: Extract getList()

    @nh2
    nh2 committed Jul 6, 2020
    Copy the full SHA
    0dcad21 View commit details
    Browse the repository at this point in the history

  2. install-grub.pl: Write state file atomically. 

    Other files were already written atomically, but not this one.
    @nh2
    nh2 committed Jul 6, 2020
    Copy the full SHA
    81c1574 View commit details
    Browse the repository at this point in the history

  3. grub: Add boot.loader.grub.extraGrubInstallArgs option. 

    Useful for when you need to build grub modules into your grub kernel
to get a working boot, as shown in the added example.

To store this new value, we switch to more structural JSON approach.

Using one line per value to store in `/boot/grub/state` gets really messy when
the values are arrays, or even worse, can contain newlines (escaping would be
needed). Further, removing a value from the file would get extra messy
(empty lines we'd have to keep for backwards compatibility).

Thus, from now on we use JSON to store all values we'll need in the future.
    @nh2
    nh2 committed Jul 6, 2020
    Copy the full SHA
    8665b5a View commit details
    Browse the repository at this point in the history

  4. install-grub.pl: Add errno messages to all or die errors. 

    For example, turns the error

    cannot copy /nix/store/g24xsmmsz46hzi6whv7qwwn17myn3jfq-grub-2.04/share/grub/unicode.pf2 to /boot

into the more useful

    cannot copy /nix/store/g24xsmmsz46hzi6whv7qwwn17myn3jfq-grub-2.04/share/grub/unicode.pf2 to /boot: Read-only file system
    @nh2
    nh2 committed Jul 6, 2020
    Copy the full SHA
    a90ae33 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #85895 from nh2/extra-grub-install-flags 

    grub: Add `boot.loader.grub.extraGrubInstallArgs` option
    @nh2
    nh2 committed Jul 6, 2020
    Copy the full SHA
    d676d5d View commit details
    Browse the repository at this point in the history