about summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2016-02-03 13:51:16 +0100
committeraszlig <aszlig@redmoonstudios.org>2016-02-03 14:19:24 +0100
commit8ecd3a5e1db40d308d60b5ccfa40eabccb419be9 (patch)
tree5b30133bfe70ff89e075f31f262caf22356d98a6 /nixos/modules
parentca21ae0eda4cf0713d92b0f70f9f43cb1a28be7f (diff)
downloadnixlib-8ecd3a5e1db40d308d60b5ccfa40eabccb419be9.tar
nixlib-8ecd3a5e1db40d308d60b5ccfa40eabccb419be9.tar.gz
nixlib-8ecd3a5e1db40d308d60b5ccfa40eabccb419be9.tar.bz2
nixlib-8ecd3a5e1db40d308d60b5ccfa40eabccb419be9.tar.lz
nixlib-8ecd3a5e1db40d308d60b5ccfa40eabccb419be9.tar.xz
nixlib-8ecd3a5e1db40d308d60b5ccfa40eabccb419be9.tar.zst
nixlib-8ecd3a5e1db40d308d60b5ccfa40eabccb419be9.zip
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 <aszlig@redmoonstudios.org>
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/system/boot/stage-1.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 98ef7ba024b4..1d9a67abcf9e 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