Unverified Commit f4de47d4 authored by Florian Klink's avatar Florian Klink Committed by GitHub
Browse files

Merge pull request #274264 from flokli/udev-rules-allow-bin-sh 

nixos/udev: allow /bin/sh in udev rules
parents ee1148c3 74461420

nixos/modules/services/hardware/udev.nix

+2 −1
Original line number Diff line number Diff line
@@ -112,7 +112,8 @@ let 
      echo "OK"



      filesToFixup="$(for i in "$out"/*; do

        grep -l '\B\(/usr\)\?/s\?bin' "$i" || :

        # list all files referring to (/usr)/bin paths, but allow references to /bin/sh.

        grep -P -l '\B(?!\/bin\/sh\b)(\/usr)?\/bin(?:\/.*)?' "$i" || :

      done)"



      if [ -n "$filesToFixup" ]; then

pkgs/tools/filesystems/bcache-tools/default.nix

+0 −4
Original line number Diff line number Diff line
@@ -35,10 +35,6 @@ stdenv.mkDerivation rec { 
    "UDEVLIBDIR=${placeholder "out"}/lib/udev/"

  ];



  preBuild = ''

    sed -e "s|/bin/sh|${bash}/bin/sh|" -i *.rules

  '';



  preInstall = ''

    mkdir -p "$out/sbin" "$out/lib/udev/rules.d" "$out/share/man/man8"

  '';