summary refs log tree commit diff
path: root/pkgs/os-specific/linux/systemd/0024-kmod-static-nodes.service-Update-ConditionFileNotEmpty.patch
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2020-03-07 22:46:14 +0100
committerFlorian Klink <flokli@flokli.de>2020-04-17 00:28:58 +0200
commitb4cbcba5b11bc102761e790e988f820fcc885578 (patch)
tree44ee85ed7eb6f9343160a64ee176c423901ac8e6 /pkgs/os-specific/linux/systemd/0024-kmod-static-nodes.service-Update-ConditionFileNotEmpty.patch
parenta6710adab21b5fe55d28ba587c3076bcf5a19e2d (diff)
downloadnixpkgs-b4cbcba5b11bc102761e790e988f820fcc885578.tar
nixpkgs-b4cbcba5b11bc102761e790e988f820fcc885578.tar.gz
nixpkgs-b4cbcba5b11bc102761e790e988f820fcc885578.tar.bz2
nixpkgs-b4cbcba5b11bc102761e790e988f820fcc885578.tar.lz
nixpkgs-b4cbcba5b11bc102761e790e988f820fcc885578.tar.xz
nixpkgs-b4cbcba5b11bc102761e790e988f820fcc885578.tar.zst
nixpkgs-b4cbcba5b11bc102761e790e988f820fcc885578.zip
systemd: update paths kmod-static-nodes.service
The previous patch just removed a `ConditionFileNotEmpty=…` line from
`kmod-static-nodes.service` referring to a location not existing on
NixOS. We know better, and can actually replace this Condition to point
to `run/booted-system/kernel-modules/lib/modules/%v/`, instead of just
patching it out.
Diffstat (limited to 'pkgs/os-specific/linux/systemd/0024-kmod-static-nodes.service-Update-ConditionFileNotEmpty.patch')
-rw-r--r--pkgs/os-specific/linux/systemd/0024-kmod-static-nodes.service-Update-ConditionFileNotEmpty.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/systemd/0024-kmod-static-nodes.service-Update-ConditionFileNotEmpty.patch b/pkgs/os-specific/linux/systemd/0024-kmod-static-nodes.service-Update-ConditionFileNotEmpty.patch
new file mode 100644
index 00000000000..df16b52660b
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/0024-kmod-static-nodes.service-Update-ConditionFileNotEmpty.patch
@@ -0,0 +1,27 @@
+From 7db89c2236158461c99fe5c5da7ddb7feab825cf Mon Sep 17 00:00:00 2001
+From: Florian Klink <flokli@flokli.de>
+Date: Sat, 7 Mar 2020 22:40:27 +0100
+Subject: [PATCH] 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 0971edf9ec..87105a87b9 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.25.1
+