diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-08 18:11:56 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-08 18:11:56 +0100 |
commit | cdb2f64a3553ac20824c4fd5b40c1115cbaf06e3 (patch) | |
tree | 0ce5dea3202b9363e15b23d89d25795afb2827f7 /pkgs/os-specific/linux/systemd/default.nix | |
parent | 30201193eab7832b05a962743591d5ee8bdda503 (diff) | |
download | nixpkgs-cdb2f64a3553ac20824c4fd5b40c1115cbaf06e3.tar nixpkgs-cdb2f64a3553ac20824c4fd5b40c1115cbaf06e3.tar.gz nixpkgs-cdb2f64a3553ac20824c4fd5b40c1115cbaf06e3.tar.bz2 nixpkgs-cdb2f64a3553ac20824c4fd5b40c1115cbaf06e3.tar.lz nixpkgs-cdb2f64a3553ac20824c4fd5b40c1115cbaf06e3.tar.xz nixpkgs-cdb2f64a3553ac20824c4fd5b40c1115cbaf06e3.tar.zst nixpkgs-cdb2f64a3553ac20824c4fd5b40c1115cbaf06e3.zip |
systemd: Get rescue.service and emergency.service to work
Diffstat (limited to 'pkgs/os-specific/linux/systemd/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 975a37fffce..e605b998c4a 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, dbus, kmod , xz, pam, acl, cryptsetup, libuuid, m4, utillinux -, glib, kbd, libxslt, coreutils, libgcrypt +, glib, kbd, libxslt, coreutils, libgcrypt, sysvtools }: assert stdenv.gcc.libc or null != null; @@ -42,14 +42,17 @@ 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; do + # FIXME: use sulogin from util-linux once updated. + 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.m4.in; do test -e $i substituteInPlace $i \ --replace /bin/mount ${utillinux}/bin/mount \ --replace /bin/umount ${utillinux}/bin/umount \ --replace /sbin/swapon ${utillinux}/sbin/swapon \ --replace /sbin/swapoff ${utillinux}/sbin/swapoff \ - --replace /sbin/fsck ${utillinux}/sbin/fsck + --replace /sbin/fsck ${utillinux}/sbin/fsck \ + --replace /bin/echo ${coreutils}/bin/echo \ + --replace /sbin/sulogin ${sysvtools}/sbin/sulogin done substituteInPlace src/journal/catalog.c \ |