philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

Merge pull request #488 from bjornfor/systemd-cat-fix

Browse source 
systemd: patch hardcoded "/bin/cat" in systemd-cat
This commit is contained in:
Peter Simons 2013-04-25 00:04:00 -07:00
commit e66fda4bba
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
'' ''
# FIXME: patch this in systemd properly (and send upstream). # FIXME: patch this in systemd properly (and send upstream).
# FIXME: use sulogin from util-linux once updated. # 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 test -e $i
substituteInPlace $i \ substituteInPlace $i \
--replace /bin/mount ${utillinux}/bin/mount \ --replace /bin/mount ${utillinux}/bin/mount \
@ -57,6 +57,7 @@ stdenv.mkDerivation rec {
--replace /sbin/swapoff ${utillinux}/sbin/swapoff \ --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 /bin/echo ${coreutils}/bin/echo \
--replace /bin/cat ${coreutils}/bin/cat \
--replace /sbin/sulogin ${sysvtools}/sbin/sulogin --replace /sbin/sulogin ${sysvtools}/sbin/sulogin
done done