amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "services/udev: Allow configuring udev to run in debug mode."

Browse source 
This reverts commit dd64f441d3.  Enabling debug
output for udevd apparently hangs the boot.
This commit is contained in:
Maxim Cournoyer 2025-03-05 10:37:56 +09:00
parent b821b80d46
commit 97be0a837e
No known key found for this signature in database
GPG key ID: 1260E46482E63562
2 changed files with 6 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

11
doc/guix.texi
View file

@ -20199,20 +20199,17 @@ In an @code{operating-system} declaration, this service type can be
@deftp {Data Type} udev-configuration @deftp {Data Type} udev-configuration
Data type representing the configuration of udev. Data type representing the configuration of udev.
@table @code @table @asis
@item udev (default: @code{eudev}) (type: file-like) @item @code{udev} (default: @code{eudev}) (type: file-like)
Package object of the udev service. This package is used at run-time, Package object of the udev service. This package is used at run-time,
when compiled for the target system. In order to generate the when compiled for the target system. In order to generate the
@file{hwdb.bin} hardware index, it is also used when generating the @file{hwdb.bin} hardware index, it is also used when generating the
system definition, compiled for the current system. system definition, compiled for the current system.
@item debug? (default: @code{#f}) (type: boolean) @item @code{rules} (default: @var{'()}) (type: list-of-file-like)
Whether to enable debug output.
@item rules (default: @code{'()}) (type: list-of-file-like)
List of file-like objects denoting udev rule files under a sub-directory. 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 List of file-like objects denoting udev hardware description files under
a sub-directory. a sub-directory.

11
gnu/services/base.scm
View file

@ -15,7 +15,7 @@
;;; Copyright © 2020, 2021 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2020, 2021 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2021 qblade <qblade@protonmail.com> ;;; Copyright © 2021 qblade <qblade@protonmail.com>
;;; Copyright © 2021 Hui Lu <luhuins@163.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 © 2021, 2025 muradm <mail@muradm.net>
;;; Copyright © 2022 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2022 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2022 Justin Veilleux <terramorpha@cock.li> ;;; Copyright © 2022 Justin Veilleux <terramorpha@cock.li>
@ -160,8 +160,6 @@
udev-configuration udev-configuration
udev-configuration? udev-configuration?
udev-configuration-udev
udev-configuration-debug?
udev-configuration-rules udev-configuration-rules
udev-configuration-hardware udev-configuration-hardware
udev-service-type udev-service-type
@ -2412,8 +2410,6 @@ command that allows you to share pre-built binaries with others over HTTP.")))
udev-configuration? udev-configuration?
(udev udev-configuration-udev ;file-like (udev udev-configuration-udev ;file-like
(default eudev)) (default eudev))
(debug? udev-configuration-debug? ;boolean
(default #f))
(rules udev-configuration-rules ;list of file-like (rules udev-configuration-rules ;list of file-like
(default '())) (default '()))
(hardware udev-configuration-hardware ;list of file-like (hardware udev-configuration-hardware ;list of file-like
@ -2556,10 +2552,7 @@ item of PACKAGES."
(umask old-umask)) (umask old-umask))
(let ((pid (fork+exec-command (let ((pid (fork+exec-command
`(,udevd (list udevd)
,@(if #$(udev-configuration-debug? config)
'("--debug")
'()))
#:environment-variables #:environment-variables
(cons* (cons*
;; The first one is for udev, the second one for ;; The first one is for udev, the second one for