From ee68bdc42e2d1f3826d69ca2a2ecca3db108b7b5 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 3 Feb 2016 15:12:57 +0100 Subject: [PATCH] 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 Fixes: #12722 --- nixos/modules/services/hardware/udev.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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... "