Unverified Commit fa99ba3c authored by Julien Malka's avatar Julien Malka Committed by GitHub
Browse files

nixos/systemd-boot: Don't write to /etc/machine-id (#347493)

parents 42bb1331 627221c2

nixos/lib/make-disk-image.nix

+0 −3
Original line number Diff line number Diff line
@@ -619,9 +619,6 @@ let format' = format; in let 
        # __noChroot for example).

        export HOME=$TMPDIR

        NIXOS_INSTALL_BOOTLOADER=1 nixos-enter --root $mountPoint -- /nix/var/nix/profiles/system/bin/switch-to-configuration boot



        # The above scripts will generate a random machine-id and we don't want to bake a single ID into all our images

        rm -f $mountPoint/etc/machine-id

      ''}



      # Set the ownerships of the contents. The modes are set in preVM.

nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py

+2 −6
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ def copy_from_file(file: str, dry_run: bool = False) -> str: 




def write_entry(profile: str | None, generation: int, specialisation: str | None,

                machine_id: str, bootspec: BootSpec, current: bool) -> None:

                machine_id: str | None, bootspec: BootSpec, current: bool) -> None:

    if specialisation:

        bootspec = bootspec.specialisations[specialisation]

    kernel = copy_from_file(bootspec.kernel)
@@ -281,11 +281,7 @@ def install_bootloader(args: argparse.Namespace) -> None: 
    except IOError as e:

        if e.errno != errno.ENOENT:

            raise

        # Since systemd version 232 a machine ID is required and it might not

        # be there on newly installed systems, so let's generate one so that

        # bootctl can find it and we can also pass it to write_entry() later.

        cmd = [f"{SYSTEMD}/bin/systemd-machine-id-setup", "--print"]

        machine_id = run(cmd, stdout=subprocess.PIPE).stdout.rstrip()

        machine_id = None



    if os.getenv("NIXOS_INSTALL_GRUB") == "1":

        warnings.warn("NIXOS_INSTALL_GRUB env var deprecated, use NIXOS_INSTALL_BOOTLOADER", DeprecationWarning)