Unverified Commit f592a7ea authored by Will Fancher's avatar Will Fancher Committed by GitHub
Browse files

Merge pull request #293720 from vkleen/fix/systemd-boot-random-seed 

nixos/systemd: Only include systemd-boot-random-seed if the unit exists
parents fd668bb4 0aed32b9

nixos/modules/system/boot/systemd.nix

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ let 


      # Maintaining state across reboots.

      "systemd-random-seed.service"

      "systemd-boot-random-seed.service"

      ] ++ (optional cfg.package.withBootloader "systemd-boot-random-seed.service") ++ [

      "systemd-backlight@.service"

      "systemd-rfkill.service"

      "systemd-rfkill.socket"

pkgs/os-specific/linux/systemd/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -856,8 +856,8 @@ stdenv.mkDerivation (finalAttrs: { 
    # needed - and therefore `interfaceVersion` should be incremented.

    interfaceVersion = 2;



    inherit withCryptsetup withHostnamed withImportd withKmod withLocaled

      withMachined withPortabled withTimedated withUtmp util-linux kmod kbd;

    inherit withBootloader withCryptsetup withHostnamed withImportd withKmod

      withLocaled withMachined withPortabled withTimedated withUtmp util-linux kmod kbd;



    tests = {

      inherit (nixosTests)