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: 2c4d9c922868
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: dc31a1ea29ca
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Feb 20, 2017

  1. systemd-boot: Make sure /etc/machine-id exists 

    This leads to the following error when trying to install a new machine
where the machine ID wasn't yet initialized during boot:

Failed to get machine did: No such file or directory

In addition this was also detected by the simpleUefiGummiboot installer
test.

So let's generate a fallback machine ID by using
systemd-machine-id-setup before actually running bootctl.

Tested this by running the installer.simpleUefiGummiboot test, it still
fails but not because of the machine ID.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @edolstra, @shlevy, @Mic92
Fixes: #22561
    @aszlig
    aszlig committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    4daccf2 View commit details
    Browse the repository at this point in the history

  2. systemd-boot: Unlink loader.conf if it exists 

    Since systemd version 232 the install subcommand of bootctl opens the
loader.conf with fopen() modes "wxe", where the "e" stands for
exclusive, so the call will fail if the file exists.

For installing the boot loader just once this is fine, but if we're
using NIXOS_INSTALL_BOOTLOADER on a systemd where the bootloader is
already present this will fail.

Exactly this is done within the simpleUefiGummiboot installer test,
where nixos-install is called twice and thus the bootloader is also
installed twice, resulting in an error during the fopen call:

Failed to open loader.conf for writing: File exists

Removing the file prior to calling bootctl should fix this.

I've tested this using the installer.simpleUefiGummiboot test and it now
succeeds.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @edolstra, @shlevy, @Mic92
Fixes: #22925
    @aszlig
    aszlig committed Feb 20, 2017
    3 Configuration menu
    Copy the full SHA
    dc31a1e View commit details
    Browse the repository at this point in the history