diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2025-03-05 10:37:56 +0900 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2025-03-05 14:25:05 +0900 |
| commit | 97be0a837e7f069b25dc76f86f7d6510601830f2 (patch) | |
| tree | f42845f9d3761096626c31c22ea39065b033a00a | |
| parent | b821b80d46d454464671c154ddb9cc727afafab8 (diff) | |
Revert "services/udev: Allow configuring udev to run in debug mode."
This reverts commit dd64f441d3dcff9165927b821da2b69b1fc6a24f. Enabling debug
output for udevd apparently hangs the boot.
| -rw-r--r-- | doc/guix.texi | 11 | ||||
| -rw-r--r-- | gnu/services/base.scm | 11 |
2 files changed, 6 insertions, 16 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 811310fa95..70e5db4156 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -20199,20 +20199,17 @@ In an @code{operating-system} declaration, this service type can be @deftp {Data Type} udev-configuration Data type representing the configuration of udev. -@table @code -@item udev (default: @code{eudev}) (type: file-like) +@table @asis +@item @code{udev} (default: @code{eudev}) (type: file-like) Package object of the udev service. This package is used at run-time, when compiled for the target system. In order to generate the @file{hwdb.bin} hardware index, it is also used when generating the system definition, compiled for the current system. -@item debug? (default: @code{#f}) (type: boolean) -Whether to enable debug output. - -@item rules (default: @code{'()}) (type: list-of-file-like) +@item @code{rules} (default: @var{'()}) (type: list-of-file-like) List of file-like objects denoting udev rule files under a sub-directory. -@item hardware (default: @code{'()}) (type: list-of-file-like) +@item @code{hardware} (default: @var{'()}) (type: list-of-file-like) List of file-like objects denoting udev hardware description files under a sub-directory. diff --git a/gnu/services/base.scm b/gnu/services/base.scm index a5d9e6334e..0d2bb31190 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2020, 2021 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2021 qblade <qblade@protonmail.com> ;;; Copyright © 2021 Hui Lu <luhuins@163.com> -;;; Copyright © 2021-2023, 2025 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021, 2025 muradm <mail@muradm.net> ;;; Copyright © 2022 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2022 Justin Veilleux <terramorpha@cock.li> @@ -160,8 +160,6 @@ udev-configuration udev-configuration? - udev-configuration-udev - udev-configuration-debug? udev-configuration-rules udev-configuration-hardware udev-service-type @@ -2412,8 +2410,6 @@ command that allows you to share pre-built binaries with others over HTTP."))) udev-configuration? (udev udev-configuration-udev ;file-like (default eudev)) - (debug? udev-configuration-debug? ;boolean - (default #f)) (rules udev-configuration-rules ;list of file-like (default '())) (hardware udev-configuration-hardware ;list of file-like @@ -2556,10 +2552,7 @@ item of PACKAGES." (umask old-umask)) (let ((pid (fork+exec-command - `(,udevd - ,@(if #$(udev-configuration-debug? config) - '("--debug") - '())) + (list udevd) #:environment-variables (cons* ;; The first one is for udev, the second one for |