diff options
author | Florian Klink <flokli@flokli.de> | 2020-04-30 01:03:18 +0200 |
---|---|---|
committer | Florian Klink <flokli@flokli.de> | 2020-04-30 01:47:35 +0200 |
commit | a3082bc6b796f539cbe02bffbb058966acb629b6 (patch) | |
tree | 9995d1f4931f6811a025e06d0b073779d55c9304 /pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch | |
parent | 8882516056f19f4a12fabd70084f4f246db9f30c (diff) | |
download | nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.tar nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.tar.gz nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.tar.bz2 nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.tar.lz nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.tar.xz nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.tar.zst nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.zip |
systemd: regenerate patches
It seems nix is much more permissive in applying patches than git am. These patches were regenerated by running `git am path/to/nixpkgs/pkgs/os-specific/linux/systemd/*.patch`, and manually running `patch -p1 < path/to/nixpkgs/pkgs/os-specific/linux/systemd/*N.patch` where necessary.
Diffstat (limited to 'pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch')
-rw-r--r-- | pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch b/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch new file mode 100644 index 00000000000..a3a9b936d13 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch @@ -0,0 +1,27 @@ +From da86057b6d1c0d39622977cfb85b7edaeeeb795e Mon Sep 17 00:00:00 2001 +From: Florian Klink <flokli@flokli.de> +Date: Sat, 7 Mar 2020 22:40:27 +0100 +Subject: [PATCH 17/18] 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.26.2 + |