diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2025-05-13 15:33:04 +0900 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2025-05-14 22:10:44 +0900 |
| commit | 9b281fd484ceef8bbb31c776231c544d7b8044fb (patch) | |
| tree | de5ac2d744bc3ceee46b8d312fe415209a62080a /gnu/packages | |
| parent | 5284d40e19390a7b8da5d1341d0ae1a1095fe8a2 (diff) | |
Revert "gnu: eudev: Fix optical discs detection/auto-mounting."
This reverts commit 670724edcfe7d71c517d4bb1680132b45accf0b8.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/linux.scm | 12 | ||||
| -rw-r--r-- | gnu/packages/patches/eudev-removable-devices-polling.patch | 39 |
2 files changed, 0 insertions, 51 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4f5546acbdb..d50f639332a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4892,7 +4892,6 @@ to the in-kernel OOM killer.") (package (name "eudev") (version "3.2.14") - (replacement eudev-fixed) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/eudev-project/eudev") @@ -5002,17 +5001,6 @@ device nodes from /dev/, handles hotplug events and loads drivers at boot time.") (license license:gpl2+))) -(define eudev-fixed - (package - (inherit eudev) - (source - (let ((base-source (package-source eudev))) - (origin - (inherit base-source) - (patches - (append (search-patches "eudev-removable-devices-polling.patch") - (origin-patches base-source)))))))) - (define-public python-evdev (package (name "python-evdev") diff --git a/gnu/packages/patches/eudev-removable-devices-polling.patch b/gnu/packages/patches/eudev-removable-devices-polling.patch deleted file mode 100644 index 51a7f6a0be4..00000000000 --- a/gnu/packages/patches/eudev-removable-devices-polling.patch +++ /dev/null @@ -1,39 +0,0 @@ -Upstream-status: https://github.com/systemd/systemd/pull/37336 -Upstream-status: https://github.com/eudev-project/eudev/pull/294 - -The existing rule would only be effective when the block drivers are compiled -as modules as opposed to being builtin. On some systems such as Guix System, -the 'sr_mod' driver for optical discs is builtin the kernel instead of a -module, and the absence of polling means there are no uevents emitted for -udisks to act on. - -This change was originally contributed to Debian by Martin Pitt to fix -<https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=713877>, later removed as it -was deemed no longer needed. It appears still useful on eudev and elogind -systems like Guix System and others. - -* rules.d/60-block.rules: Apply kernel polling to all removable devices instead -of just those of the block category handled by a kernel module. ---- - rules.d/60-block.rules | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/rules.d/60-block.rules b/rules.d/60-block.rules -index c3bf32eb83..cc1eb7055e 100644 ---- a/rules/60-block.rules -+++ b/rules/60-block.rules -@@ -1,8 +1,7 @@ - # do not edit this file, it will be overwritten on update - - # enable in-kernel media-presence polling --ACTION=="add", SUBSYSTEM=="module", KERNEL=="block", ATTR{parameters/events_dfl_poll_msecs}=="0", \ -- ATTR{parameters/events_dfl_poll_msecs}="2000" -+ACTION=="add", ATTR{removable}=="1", ATTR{events_poll_msecs}=="-1", ATTR{events_poll_msecs}="2000" - - # forward scsi device event to corresponding block device - ACTION=="change", SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST=="block", ATTR{block/*/uevent}="change" - -base-commit: 0e0d3ed93a4e816f8ca5efb3760ceb640fea11bc --- -2.49.0 - |
