diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-07-28 13:44:21 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-07-28 17:46:39 +0000 |
commit | cab13e087c80c4e7476bb7df432e2b7deb56563d (patch) | |
tree | f8c7f771072bc7c5453625dfdb80cbd3d2c30fb4 /pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch | |
parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
parent | 8ecc61c91a596df7d3293603a9c2384190c1b89a (diff) | |
download | nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.gz nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.bz2 nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.lz nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.xz nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.zst nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.zip |
Merge remote-tracking branch 'nixpkgs/nixos-unstable' into nixpkgs-update
Conflicts: pkgs/applications/graphics/hello-wayland/default.nix pkgs/applications/virtualization/cloud-hypervisor/default.nix pkgs/applications/window-managers/tinywl/default.nix pkgs/applications/window-managers/wayfire/applications.nix pkgs/applications/window-managers/wayfire/default.nix pkgs/applications/window-managers/wayfire/wcm.nix pkgs/applications/window-managers/wayfire/wf-config.nix pkgs/applications/window-managers/wayfire/wf-shell.nix pkgs/development/libraries/wlroots/default.nix pkgs/os-specific/linux/chromium-os/crosvm/default.nix pkgs/os-specific/linux/kernel/common-config.nix pkgs/os-specific/linux/kernel/patches.nix pkgs/os-specific/linux/mdevd/default.nix pkgs/os-specific/linux/s6-linux-init/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch')
-rw-r--r-- | pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch b/pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch new file mode 100644 index 00000000000..ad19d910e1e --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch @@ -0,0 +1,27 @@ +From ba19f629c1806ca2d2ab58154e45bce4ae4a3f0c Mon Sep 17 00:00:00 2001 +From: Florian Klink <flokli@flokli.de> +Date: Sat, 7 Mar 2020 22:40:27 +0100 +Subject: [PATCH 16/19] kmod-static-nodes.service: Update ConditionFileNotEmpty + +On NixOS, kernel modules of the currently booted systems are located at +/run/booted-system/kernel-modules/lib/modules/%v/, not /lib/modules/%v/. +--- + units/kmod-static-nodes.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/units/kmod-static-nodes.service.in b/units/kmod-static-nodes.service.in +index f4170d6a99..9a6a591bea 100644 +--- a/units/kmod-static-nodes.service.in ++++ b/units/kmod-static-nodes.service.in +@@ -12,7 +12,7 @@ Description=Create list of static device nodes for the current kernel + DefaultDependencies=no + Before=sysinit.target systemd-tmpfiles-setup-dev.service + ConditionCapability=CAP_SYS_MODULE +-ConditionFileNotEmpty=/lib/modules/%v/modules.devname ++ConditionFileNotEmpty=/run/booted-system/kernel-modules/lib/modules/%v/modules.devname + + [Service] + Type=oneshot +-- +2.30.1 + |