diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-02 00:49:42 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-02 00:49:42 +0200 |
| commit | f678a1ae4ddf57c69fe0dedce356928a8c41e487 (patch) | |
| tree | 296ce9ae9a9d6cb36b0af72f3409ded2ded9d902 /pkgs/os-specific/linux/systemd/default.nix | |
| parent | 2c156472b3b8f030e2c7a03cb9cafb8bae0f117c (diff) | |
| download | nixpkgs-f678a1ae4ddf57c69fe0dedce356928a8c41e487.tar nixpkgs-f678a1ae4ddf57c69fe0dedce356928a8c41e487.tar.gz nixpkgs-f678a1ae4ddf57c69fe0dedce356928a8c41e487.tar.bz2 nixpkgs-f678a1ae4ddf57c69fe0dedce356928a8c41e487.tar.lz nixpkgs-f678a1ae4ddf57c69fe0dedce356928a8c41e487.tar.xz nixpkgs-f678a1ae4ddf57c69fe0dedce356928a8c41e487.tar.zst nixpkgs-f678a1ae4ddf57c69fe0dedce356928a8c41e487.zip | |
systemd: Apply some upstream bug fixes
Diffstat (limited to 'pkgs/os-specific/linux/systemd/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index ae759607889..214e6e8e39b 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { preConfigure = '' # FIXME: patch this in systemd properly (and send upstream). - 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/core/shutdown.c src/nspawn/nspawn.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/core/shutdown.c src/nspawn/nspawn.c src/shared/generator.c; do test -e $i substituteInPlace $i \ --replace /usr/bin/getent ${stdenv.glibc}/bin/getent \ @@ -79,7 +79,8 @@ stdenv.mkDerivation rec { --replace /sbin/swapoff ${utillinux}/sbin/swapoff \ --replace /bin/echo ${coreutils}/bin/echo \ --replace /bin/cat ${coreutils}/bin/cat \ - --replace /sbin/sulogin ${utillinux}/sbin/sulogin + --replace /sbin/sulogin ${utillinux}/sbin/sulogin \ + --replace /usr/lib/systemd/systemd-fsck $out/lib/systemd/systemd-fsck done substituteInPlace src/journal/catalog.c \ |