From 8ecd3a5e1db40d308d60b5ccfa40eabccb419be9 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 3 Feb 2016 13:51:16 +0100 Subject: [PATCH] nixos/stage-1: Fix references to readlink/basename Fixes references coming from the mdadm udev rules. This addresses #12722 (mdadm udev rules have references to /usr/bin) but still won't fix the warning, though (if we want to fix the warnings, we will have to patch the udev rules generater in services/hardware/udev). For common mdraid functionality, this shouldn't fix anything, because the wrong references seem to only apply to containers, see these (wrapped) lines from ${mdadm}/lib/udev/rules.d/63-md-raid-arrays.rules: # Tell systemd to run mdmon for our container, if we need it. ENV{MD_LEVEL}=="raid[1-9]*", ENV{MD_CONTAINER}=="?*", PROGRAM="/usr/bin/readlink $env{MD_CONTAINER}", ENV{MD_MON_THIS}="%c" ENV{MD_MON_THIS}=="?*", PROGRAM="/usr/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdmon@%c.service" Signed-off-by: aszlig --- nixos/modules/system/boot/stage-1.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 98ef7ba024b..1d9a67abcf9 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -157,7 +157,9 @@ let --replace /sbin/blkid ${extraUtils}/bin/blkid \ --replace ${pkgs.lvm2}/sbin ${extraUtils}/bin \ --replace /sbin/mdadm ${extraUtils}/bin/mdadm \ - --replace /bin/sh ${extraUtils}/bin/sh + --replace /bin/sh ${extraUtils}/bin/sh \ + --replace /usr/bin/readlink ${extraUtils}/bin/readlink \ + --replace /usr/bin/basename ${extraUtils}/bin/basename done # Work around a bug in QEMU, which doesn't implement the "READ