diff mbox series

[bug#40274,v7,1/2] services: Allow modprobe to use "/etc/modprobe.d".

Message ID 20200405052803.15711-2-brice@waegenei.re
State Accepted
Headers show
Series gnu: Add kernel-module-loader-service. | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job

Commit Message

Brice Waegeneire April 5, 2020, 5:28 a.m. UTC 
This is a temporary crutch allowing 'modprobe' to load it's
configuration from "/etc/modprobe.d". The definitive fix is contained in
<https://issues.guix.info/issue/40422> which need to go trough the
core-upates branch as it rebuild over 2200 packages.

* gnu/services.scm (%modprobe-wrapper): Set 'MODPROBE_OPTIONS'
environment variable.
---
 gnu/services.scm | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Danny Milosavljevic April 5, 2020, 11:11 a.m. UTC | #1 
Pushed to guix master as commit 8c88e242292db9b35b4ae6ad788a0f8f3c94bb53.

I think core-updates will be merged to master pretty soon anyway, but the
question is whether we want to update it in core-updates before that, given
how many dependencies that has (WTF! What's up with that?).
Brice Waegeneire April 5, 2020, 12:38 p.m. UTC | #2 
On 2020-04-05 11:11, Danny Milosavljevic wrote:
> Pushed to guix master as commit 
> 8c88e242292db9b35b4ae6ad788a0f8f3c94bb53.
> 
> I think core-updates will be merged to master pretty soon anyway, but 
> the
> question is whether we want to update it in core-updates before that, 
> given
> how many dependencies that has (WTF! What's up with that?).

Thank you for helping with that!

I thought that core-updates was frozen which would delay #40422 for some 
time.
I wrote the crutch patch to avoid having to wait before supporting 
module
arguments, especially since Florian already had a need for it.
diff mbox series

Patch

diff --git a/gnu/services.scm b/gnu/services.scm
index e7a3a95e43..1c39c779a7 100644
--- a/gnu/services.scm
+++ b/gnu/services.scm
@@ -579,6 +579,10 @@  ACTIVATION-SCRIPT-TYPE."
                   #~(begin
                       (setenv "LINUX_MODULE_DIRECTORY"
                               "/run/booted-system/kernel/lib/modules")
+                      ;; FIXME: Remove this crutch when the patch #40422,
+                      ;; updating to kmod 27 is merged
+                      (setenv "MODPROBE_OPTIONS"
+                              "-C /etc/modprobe.d")
                       (apply execl #$modprobe
                              (cons #$modprobe (cdr (command-line))))))))