public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into x-updates

Browse Source
This commit is contained in:
Vladimír Čunát
2013-05-01 08:14:15 +02:00
parent f5f56bd881 b8eaa5d3eb
commit 8fc5fb6ecc
63 changed files with 407 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/os-specific/linux/systemd/default.nix
View File

@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
''
# FIXME: patch this in systemd properly (and send upstream).
# 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
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 src/journal/cat.c; do
test -e $i
substituteInPlace $i \
--replace /bin/mount ${utillinux}/bin/mount \
@@ -56,6 +56,7 @@ stdenv.mkDerivation rec {
--replace /sbin/swapoff ${utillinux}/sbin/swapoff \
--replace /sbin/fsck ${utillinux}/sbin/fsck \
--replace /bin/echo ${coreutils}/bin/echo \
--replace /bin/cat ${coreutils}/bin/cat \
--replace /sbin/sulogin ${sysvtools}/sbin/sulogin
done