diff options
| author | Florian Klink <flokli@flokli.de> | 2020-08-24 12:42:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-24 12:42:24 +0200 |
| commit | 40d2968ebf3b2b4c547caaa776b6eb875e1e5f83 (patch) | |
| tree | e162a8e316931cc8eab5f0123dcbe76f24b21eea /nixos/modules/system/boot | |
| parent | 6d122d67fa3ae31f36405ecad6bf0cbfc156ed79 (diff) | |
| parent | 618e273861f7eda1f04fd8909cbe066e75556070 (diff) | |
| download | nixpkgs-40d2968ebf3b2b4c547caaa776b6eb875e1e5f83.tar nixpkgs-40d2968ebf3b2b4c547caaa776b6eb875e1e5f83.tar.gz nixpkgs-40d2968ebf3b2b4c547caaa776b6eb875e1e5f83.tar.bz2 nixpkgs-40d2968ebf3b2b4c547caaa776b6eb875e1e5f83.tar.lz nixpkgs-40d2968ebf3b2b4c547caaa776b6eb875e1e5f83.tar.xz nixpkgs-40d2968ebf3b2b4c547caaa776b6eb875e1e5f83.tar.zst nixpkgs-40d2968ebf3b2b4c547caaa776b6eb875e1e5f83.zip | |
Merge pull request #94354 from flokli/systemd-246
systemd: 245.6 -> 246
Diffstat (limited to 'nixos/modules/system/boot')
| -rw-r--r-- | nixos/modules/system/boot/stage-1.nix | 5 | ||||
| -rw-r--r-- | nixos/modules/system/boot/systemd.nix | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index a04660fb56e..ec5eadf69c3 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -119,12 +119,13 @@ let copy_bin_and_libs ${pkgs.mdadm}/sbin/mdmon # Copy udev. - copy_bin_and_libs ${udev}/lib/systemd/systemd-udevd - copy_bin_and_libs ${udev}/lib/systemd/systemd-sysctl copy_bin_and_libs ${udev}/bin/udevadm + copy_bin_and_libs ${udev}/lib/systemd/systemd-sysctl for BIN in ${udev}/lib/udev/*_id; do copy_bin_and_libs $BIN done + # systemd-udevd is only a symlink to udevadm these days + ln -sf udevadm $out/bin/systemd-udevd # Copy modprobe. copy_bin_and_libs ${pkgs.kmod}/bin/kmod diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index b215392f250..10343df70aa 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -903,11 +903,9 @@ in ) ]); passwd = (mkMerge [ - [ "mymachines" ] (mkAfter [ "systemd" ]) ]); group = (mkMerge [ - [ "mymachines" ] (mkAfter [ "systemd" ]) ]); }; |