about summary refs log tree commit diff
path: root/nixos/modules/services/hardware
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2016-02-03 15:12:57 +0100
committeraszlig <aszlig@redmoonstudios.org>2016-02-03 15:45:37 +0100
commitee68bdc42e2d1f3826d69ca2a2ecca3db108b7b5 (patch)
tree6bf2e92709bbabc319dea68a73887d9870df73ef /nixos/modules/services/hardware
parent42709fb4e994df64bce606afe46d38c3d93142b4 (diff)
downloadnixlib-ee68bdc42e2d1f3826d69ca2a2ecca3db108b7b5.tar
nixlib-ee68bdc42e2d1f3826d69ca2a2ecca3db108b7b5.tar.gz
nixlib-ee68bdc42e2d1f3826d69ca2a2ecca3db108b7b5.tar.bz2
nixlib-ee68bdc42e2d1f3826d69ca2a2ecca3db108b7b5.tar.lz
nixlib-ee68bdc42e2d1f3826d69ca2a2ecca3db108b7b5.tar.xz
nixlib-ee68bdc42e2d1f3826d69ca2a2ecca3db108b7b5.tar.zst
nixlib-ee68bdc42e2d1f3826d69ca2a2ecca3db108b7b5.zip
nixos/udev: Fix up readlink and basename as well
In 8ecd3a5, we fixed up the FHS paths for stage 1, but unfortunately we
have a similar udev rules generator twice one for the initrd and one
without. So we might need to refactor this in the future.

For now, let's just fix the references to readlink and basename in the
udev module as well until we have properly addressed this.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Fixes: #12722
Diffstat (limited to 'nixos/modules/services/hardware')
-rw-r--r--nixos/modules/services/hardware/udev.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index daa2fd89baca..1821fe8c0b8a 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -61,7 +61,9 @@ let
           --replace \"/sbin/modprobe \"${config.system.sbin.modprobe}/sbin/modprobe \
           --replace \"/sbin/mdadm \"${pkgs.mdadm}/sbin/mdadm \
           --replace \"/sbin/blkid \"${pkgs.utillinux}/sbin/blkid \
-          --replace \"/bin/mount \"${pkgs.utillinux}/bin/mount
+          --replace \"/bin/mount \"${pkgs.utillinux}/bin/mount \
+          --replace /usr/bin/readlink ${pkgs.coreutils}/bin/readlink \
+          --replace /usr/bin/basename ${pkgs.coreutils}/bin/basename
       done
 
       echo -n "Checking that all programs called by relative paths in udev rules exist in ${udev}/lib/udev... "