diff options
author | Will Dietz <w@wdtz.org> | 2019-10-05 12:25:43 -0500 |
---|---|---|
committer | Will Dietz <w@wdtz.org> | 2019-10-07 18:39:15 -0500 |
commit | 87b46091bf92f71d0bf63efb041960f8a0d1df68 (patch) | |
tree | 9301771868f3ead5f3a7cd5149874ee6b7f7cc60 /pkgs/os-specific/linux/systemd/default.nix | |
parent | 37e7f09f654ddd579e43f93b10eaa5e31976c48f (diff) | |
download | nixpkgs-87b46091bf92f71d0bf63efb041960f8a0d1df68.tar nixpkgs-87b46091bf92f71d0bf63efb041960f8a0d1df68.tar.gz nixpkgs-87b46091bf92f71d0bf63efb041960f8a0d1df68.tar.bz2 nixpkgs-87b46091bf92f71d0bf63efb041960f8a0d1df68.tar.lz nixpkgs-87b46091bf92f71d0bf63efb041960f8a0d1df68.tar.xz nixpkgs-87b46091bf92f71d0bf63efb041960f8a0d1df68.tar.zst nixpkgs-87b46091bf92f71d0bf63efb041960f8a0d1df68.zip |
systemd: fix /sbin/modprobe usage in logind, nspawn@ service files
Diffstat (limited to 'pkgs/os-specific/linux/systemd/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 8c1dd904c3b..1079d255c64 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation { export LC_ALL="en_US.UTF-8"; # FIXME: patch this in systemd properly (and send upstream). # already fixed in f00929ad622c978f8ad83590a15a765b4beecac9: (u)mount - for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.in src/journal/cat.c src/shutdown/shutdown.c src/nspawn/nspawn.c src/shared/generator.c; do + for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.in src/journal/cat.c src/shutdown/shutdown.c src/nspawn/nspawn.c src/shared/generator.c units/systemd-logind.service.in units/systemd-nspawn@.service.in; do test -e $i substituteInPlace $i \ --replace /usr/bin/getent ${getent}/bin/getent \ @@ -124,6 +124,7 @@ stdenv.mkDerivation { --replace /bin/echo ${coreutils}/bin/echo \ --replace /bin/cat ${coreutils}/bin/cat \ --replace /sbin/sulogin ${lib.getBin utillinux}/sbin/sulogin \ + --replace /sbin/modprobe ${lib.getBin kmod}/sbin/modprobe \ --replace /usr/lib/systemd/systemd-fsck $out/lib/systemd/systemd-fsck \ --replace /bin/plymouth /run/current-system/sw/bin/plymouth # To avoid dependency done |