diff options
| author | ajs124 <git@ajs124.de> | 2021-12-06 14:39:41 +0000 |
|---|---|---|
| committer | ajs124 <git@ajs124.de> | 2021-12-06 14:39:41 +0000 |
| commit | 32e30e84f60db3eefd3e4a0e029844aaccdec0f8 (patch) | |
| tree | 6c7574c2e20222f070e8c9d77d365dfd68319f6e /pkgs/os-specific/linux/systemd | |
| parent | 84a769c071c5205428de4a57b7fd0c8ed9c6df26 (diff) | |
| download | nixpkgs-32e30e84f60db3eefd3e4a0e029844aaccdec0f8.tar nixpkgs-32e30e84f60db3eefd3e4a0e029844aaccdec0f8.tar.gz nixpkgs-32e30e84f60db3eefd3e4a0e029844aaccdec0f8.tar.bz2 nixpkgs-32e30e84f60db3eefd3e4a0e029844aaccdec0f8.tar.lz nixpkgs-32e30e84f60db3eefd3e4a0e029844aaccdec0f8.tar.xz nixpkgs-32e30e84f60db3eefd3e4a0e029844aaccdec0f8.tar.zst nixpkgs-32e30e84f60db3eefd3e4a0e029844aaccdec0f8.zip | |
systemd: align kmod-static-nodes.service with kmod paths
Diffstat (limited to 'pkgs/os-specific/linux/systemd')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch | 25 |
1 files changed, 15 insertions, 10 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 index 156195d9a90..12624cb5548 100644 --- 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 @@ -1,27 +1,32 @@ -From bee1d855d4fb7f2d6f6b9beb1dfd14b1dea31887 Mon Sep 17 00:00:00 2001 +From 775a2a8940c07f4af33a2a11bfa17e0257b427cb 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/21] kmod-static-nodes.service: Update ConditionFileNotEmpty +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/. +kmod loads modules from not only /lib/modules but also from +/run/booted-system/kernel-modules/lib/modules and +/run/current-system/kernel-modules/lib/module + +Co-authored-by: Arian van Putten <arian.vanputten@gmail.com> --- - units/kmod-static-nodes.service.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + units/kmod-static-nodes.service.in | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/units/kmod-static-nodes.service.in b/units/kmod-static-nodes.service.in -index 777e82d16b..b6abc2bba0 100644 +index 777e82d16b..9a5e05a1cc 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 +@@ -12,7 +12,9 @@ Description=Create List of Static Device Nodes 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 ++ConditionFileNotEmpty=|/lib/modules/%v/modules.devname ++ConditionFileNotEmpty=|/run/booted-system/kernel-modules/lib/modules/%v/modules.devname ++ConditionFileNotEmpty=|/run/current-system/kernel-modules/lib/modules/%v/modules.devname [Service] Type=oneshot -- -2.33.0 +2.33.1 |