ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

services: elogind: Fix default behavior for lid close.

Browse source 
Fixes <https://issues.guix.gnu.org/57052>, which was a behavior change
introduced inadvertently in 4c698cd512.

* gnu/services/desktop.scm (<elogind-configuration>)
[handle-lid-switch-external-power]: Default to *unspecified*, which serializes
to nothing.  This matches upstream behavior, meaning that even when plugged to
a power cord, a laptop will suspend when the lid is closed.
* doc/guix.texi (Desktop Services): Update doc.

Reported-by: Cairn <cairn@pm.me>
This commit is contained in:
Maxim Cournoyer 2022-08-09 23:51:48 -04:00
parent 4b49487838
commit 59ee837d8b
No known key found for this signature in database
GPG key ID: 1260E46482E63562
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/guix.texi
View file

@ -22442,7 +22442,7 @@ their default values are:
@item handle-lid-switch-docked @item handle-lid-switch-docked
@code{ignore} @code{ignore}
@item handle-lid-switch-external-power @item handle-lid-switch-external-power
@code{ignore} @code{*unspecified*}
@item power-key-ignore-inhibited? @item power-key-ignore-inhibited?
@code{#f} @code{#f}
@item suspend-key-ignore-inhibited? @item suspend-key-ignore-inhibited?

8
gnu/services/desktop.scm
View file

@ -3,7 +3,7 @@
;;; Copyright © 2015 Andy Wingo <wingo@igalia.com> ;;; Copyright © 2015 Andy Wingo <wingo@igalia.com>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2017, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2017, 2020, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2017 Nikita <nikita@n0.is> ;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2018, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
@ -971,7 +971,7 @@ (define-record-type* <elogind-configuration> elogind-configuration
(handle-lid-switch-docked elogind-handle-lid-switch-docked (handle-lid-switch-docked elogind-handle-lid-switch-docked
(default 'ignore)) (default 'ignore))
(handle-lid-switch-external-power elogind-handle-lid-switch-external-power (handle-lid-switch-external-power elogind-handle-lid-switch-external-power
(default 'ignore)) (default *unspecified*))
(power-key-ignore-inhibited? elogind-power-key-ignore-inhibited? (power-key-ignore-inhibited? elogind-power-key-ignore-inhibited?
(default #f)) (default #f))
(suspend-key-ignore-inhibited? elogind-suspend-key-ignore-inhibited? (suspend-key-ignore-inhibited? elogind-suspend-key-ignore-inhibited?
@ -1032,7 +1032,9 @@ (define (non-negative-integer x)
(define handle-actions (define handle-actions
'(ignore poweroff reboot halt kexec suspend hibernate hybrid-sleep lock)) '(ignore poweroff reboot halt kexec suspend hibernate hybrid-sleep lock))
(define (handle-action x) (define (handle-action x)
(enum x handle-actions)) (if (unspecified? x)
"" ;empty serializer
(enum x handle-actions)))
(define (sleep-list tokens) (define (sleep-list tokens)
(unless (valid-list? tokens char-set:user-name) (unless (valid-list? tokens char-set:user-name)
(error "invalid sleep list" tokens)) (error "invalid sleep list" tokens))