cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
nixos/systemd: Only include systemd-boot-random-seed if the unit exists
This commit is contained in:
Will Fancher 2024-03-09 21:01:35 -05:00 committed by GitHub
commit f592a7ea77
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/system/boot/systemd.nix
View file

@ -97,7 +97,7 @@ let
# Maintaining state across reboots. # Maintaining state across reboots.
"systemd-random-seed.service" "systemd-random-seed.service"
"systemd-boot-random-seed.service" ] ++ (optional cfg.package.withBootloader "systemd-boot-random-seed.service") ++ [
"systemd-backlight@.service" "systemd-backlight@.service"
"systemd-rfkill.service" "systemd-rfkill.service"
"systemd-rfkill.socket" "systemd-rfkill.socket"

4
pkgs/os-specific/linux/systemd/default.nix
View file

@ -856,8 +856,8 @@ stdenv.mkDerivation (finalAttrs: {
# needed - and therefore `interfaceVersion` should be incremented. # needed - and therefore `interfaceVersion` should be incremented.
interfaceVersion = 2; interfaceVersion = 2;
inherit withCryptsetup withHostnamed withImportd withKmod withLocaled inherit withBootloader withCryptsetup withHostnamed withImportd withKmod
withMachined withPortabled withTimedated withUtmp util-linux kmod kbd; withLocaled withMachined withPortabled withTimedated withUtmp util-linux kmod kbd;
tests = { tests = {
inherit (nixosTests) inherit (nixosTests)