nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-28 08:33:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
c1fffdfffb
nixpkgs/pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

28 lines
1.0 KiB
Diff
Raw Normal View History

systemd: 249.7 -> 250.3
2021-12-12 02:56:45 +00:00
From df0fec7ac2f33bcca60ba9a2396af33397ba42cc Mon Sep 17 00:00:00 2001
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.
2020-03-07 21:46:14 +00:00
From: Florian Klink <flokli@flokli.de>
Date: Sat, 7 Mar 2020 22:40:27 +0100
systemd: align kmod-static-nodes.service with kmod paths
2021-12-06 14:39:41 +00:00
Subject: [PATCH 16/19] kmod-static-nodes.service: Update ConditionFileNotEmpty
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.
2020-03-07 21:46:14 +00:00
systemd: 249.7 -> 250.3
2021-12-12 02:56:45 +00:00
On NixOS, kernel modules of the currently booted systems are located at
/run/booted-system/kernel-modules/lib/modules/%v/, not /lib/modules/%v/.
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.
2020-03-07 21:46:14 +00:00
---
systemd: 249.7 -> 250.3
2021-12-12 02:56:45 +00:00
units/kmod-static-nodes.service.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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.
2020-03-07 21:46:14 +00:00
diff --git a/units/kmod-static-nodes.service.in b/units/kmod-static-nodes.service.in
systemd: 249.7 -> 250.3
2021-12-12 02:56:45 +00:00
index 777e82d16b..b6abc2bba0 100644
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.
2020-03-07 21:46:14 +00:00
--- a/units/kmod-static-nodes.service.in
+++ b/units/kmod-static-nodes.service.in
systemd: 249.7 -> 250.3
2021-12-12 02:56:45 +00:00
@@ -12,7 +12,7 @@ Description=Create List of Static Device Nodes
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.
2020-03-07 21:46:14 +00:00
DefaultDependencies=no
Before=sysinit.target systemd-tmpfiles-setup-dev.service
ConditionCapability=CAP_SYS_MODULE
-ConditionFileNotEmpty=/lib/modules/%v/modules.devname
systemd: 249.7 -> 250.3
2021-12-12 02:56:45 +00:00
+ConditionFileNotEmpty=/run/booted-system/kernel-modules/lib/modules/%v/modules.devname
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.
2020-03-07 21:46:14 +00:00
[Service]
Type=oneshot
--
systemd: 249.7 -> 250.3
2021-12-12 02:56:45 +00:00
2.34.0
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.
2020-03-07 21:46:14 +00:00
Reference in New Issue Copy Permalink