Unverified Commit 9075a0d5 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #268718 from ners/udev 

treewide: replace broken udev paths with systemd
parents a3a15d72 ed31e023

nixos/modules/security/lock-kernel-modules.nix

+2 −2
Original line number Diff line number Diff line 
{ config, pkgs, lib, ... }:

{ config, lib, ... }:



with lib;
@@ -49,7 +49,7 @@ with lib; 
        };



      script = ''

        ${pkgs.udev}/bin/udevadm settle

        ${config.systemd.package}/bin/udevadm settle

        echo -n 1 >/proc/sys/kernel/modules_disabled

      '';

    };

nixos/modules/services/hardware/usbmuxd.nix

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ in 
      serviceConfig = {

        # Trigger the udev rule manually. This doesn't require replugging the

        # device when first enabling the option to get it to work

        ExecStartPre = "${pkgs.udev}/bin/udevadm trigger -s usb -a idVendor=${apple}";

        ExecStartPre = "${config.systemd.package}/bin/udevadm trigger -s usb -a idVendor=${apple}";

        ExecStart = "${cfg.package}/bin/usbmuxd -U ${cfg.user} -v";

      };

    };

pkgs/tools/filesystems/stratisd/default.nix

+2 −3
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
, dbus

, cryptsetup

, util-linux

, udev

, lvm2

, systemd

, xfsprogs
@@ -53,7 +52,7 @@ stdenv.mkDerivation rec { 
      --replace stratis-min           "$out/bin/stratis-min" \

      --replace systemd-ask-password  "${systemd}/bin/systemd-ask-password" \

      --replace sleep                 "${coreutils}/bin/sleep" \

      --replace udevadm               "${udev}/bin/udevadm"

      --replace udevadm               "${systemd}/bin/udevadm"

  '';



  nativeBuildInputs = [
@@ -72,7 +71,7 @@ stdenv.mkDerivation rec { 
    dbus

    cryptsetup

    util-linux

    udev

    systemd

    lvm2

  ];

pkgs/tools/misc/brltty/default.nix

+2 −2
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, pkg-config, python3, bluez

, tcl, acl, kmod, coreutils, shadow, util-linux, udev

, tcl, acl, kmod, coreutils, shadow, util-linux

, alsaSupport ? stdenv.isLinux, alsa-lib

, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd

}:
@@ -90,6 +90,6 @@ stdenv.mkDerivation rec { 
     )

     substituteInPlace $out/libexec/brltty/systemd-wrapper \

       --replace 'logger' "${util-linux}/bin/logger" \

       --replace 'udevadm' "${udev}/bin/udevadm"

       --replace 'udevadm' "${systemd}/bin/udevadm"

  '';

}

pkgs/tools/misc/os-prober/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ coreutils, # mktemp 
grub2,      # grub-mount and grub-probe

cryptsetup, # cryptsetup

libuuid,    # blkid and blockdev

udev,    # udevadm udevinfo

systemd,    # udevadm

ntfs3g,     # ntfs3g

dmraid,     # dmraid

lvm2        # lvs
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec { 
    done;

    for file in $out/bin/*; do

      wrapProgram $file \

        --suffix PATH : ${lib.makeBinPath [ grub2 udev coreutils cryptsetup libuuid ntfs3g lvm2 dmraid ]} \

        --suffix PATH : ${lib.makeBinPath [ grub2 systemd coreutils cryptsetup libuuid ntfs3g lvm2 dmraid ]} \

        --run "[ -d /var/lib/os-prober ] || mkdir /var/lib/os-prober"

    done;

  '';