From unknown Sun Jun 22 07:57:14 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#72504] [PATCH] services: elogind-configuration: Add more sleep configurations Resent-From: Morgan Smith Original-Sender: "Debbugs-submit" Resent-CC: pelzflorian@pelzflorian.de, ludo@gnu.org, matt@excalamus.com, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 07 Aug 2024 02:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 72504 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72504@debbugs.gnu.org Cc: Morgan Smith , Florian Pelz , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Matthew Trzcinski , Maxim Cournoyer X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Florian Pelz , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Matthew Trzcinski , Maxim Cournoyer Received: via spool by submit@debbugs.gnu.org id=B.17229959484333 (code B ref -1); Wed, 07 Aug 2024 02:00:02 +0000 Received: (at submit) by debbugs.gnu.org; 7 Aug 2024 01:59:08 +0000 Received: from localhost ([127.0.0.1]:33395 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbVxD-00017o-UF for submit@debbugs.gnu.org; Tue, 06 Aug 2024 21:59:08 -0400 Received: from lists.gnu.org ([209.51.188.17]:56320) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbVxB-00017g-VY for submit@debbugs.gnu.org; Tue, 06 Aug 2024 21:59:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sbVwn-0002x2-6h for guix-patches@gnu.org; Tue, 06 Aug 2024 21:58:41 -0400 Received: from mail-dm6nam11olkn2068.outbound.protection.outlook.com ([40.92.19.68] helo=NAM11-DM6-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sbVwl-0006ql-7V for guix-patches@gnu.org; Tue, 06 Aug 2024 21:58:40 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Sfoa6KaRGpHanq9NxgX41tGBzLFPic6yWa+eJQ3v9ISD44yDrwd94bIUr6fjEuxbu1TmLJ5rPrvyZPEBycT6qOXiGu2IWGXOmXXPxXrWYU9QWXJN+j2N9BZfz4HzOyFcHU07NYALb2571Vy9h89AbFt6tDi2b5n5tr1AhuER4Ue4Ba8ppKaf65uliv8jaNS0Q3/rGy2TW9EFcdHM1m1+CwQYYqMTkM3DstN7kNgX0XamAS/IFWBAKqmMde4GISQRRHrpo+5tCnL9gp6bLgofHtO372EmLuPMCOTcYWLqpNRLvOVEIWGluj/j2wzMswWEeTbghqTue1rp7yIltjQqRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=rCJXbq28FZLHJYAhBT1A7o80dM6c1OnhPGqhIF7SeMw=; b=IE2cGyc8rExV4aU3VKtCHW7iHgVHyUYpbfxP4NTNfE5GV2kfZdyUSqV2QJlev+KqVuUGUqKkgd+LFf7ync76oo25b4ywQhZe3h/weLnQoO0gbrN7TdePY5QkU1slwKFYVq/bH8vol9U3SoXUUl3gprkSLEVNSNZDt72NtmtPTliaURSKG0aFag1jsLB3c9q3RSSZqLdzp656Ge6EE9A7CLqSnTEFvEpivzO0nP8Y7yv3iImhEwkevsIKLN/svsTcR2yZQETOb0E6kZRgcEnNbhh5o2/hMWJf02xhNqnwXUpNWWKdEZWcB8vXVp2AqmE1RY/tA/lps4PMlF1qWG9vdQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rCJXbq28FZLHJYAhBT1A7o80dM6c1OnhPGqhIF7SeMw=; b=jcwvUZ5WjrUVsGhzNoq4THBRc0qAWdSK9hgYI90i2Xw1WxOdqsOyixzX064CNYQsF5Uw0DTchcxanJxRyJuNw7l2hCRwIogPIL4aRNtSOU9iDc2e/Dh0HONHb8JXK4tkFersStryte+oZ+eeeIUbKdxV6bSnRpJ6sAQ5y51DAVmzIoir4305gezYwWeSXGUUFGwkQclbHYRzIOrSKj4wI4p9ly+npMkVJ0I1qqMZ1UG8JINlJgjXDUJ0cD4iU7MbxcvJfHO+d0aPth7xe0JSf/Ohr7gl3axMKMfKaUWkVzOIVLXyWAg9yOzKIB7kl2jYw/ORq+d/BocWlojh4KU7ww== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by IA2PR84MB3934.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:208:4af::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.23; Wed, 7 Aug 2024 01:53:35 +0000 Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef]) by CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef%7]) with mapi id 15.20.7828.023; Wed, 7 Aug 2024 01:53:35 +0000 From: Morgan Smith Date: Tue, 6 Aug 2024 21:51:37 -0400 Message-ID: X-Mailer: git-send-email 2.45.2 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-TMN: [VCtFptXl11MvvRWma7lJKdV6JX0QDxqI] X-ClientProxiedBy: YT4PR01CA0347.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:fc::18) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|IA2PR84MB3934:EE_ X-MS-Office365-Filtering-Correlation-Id: 3f81b85a-d576-4b93-c248-08dcb683bf65 X-Microsoft-Antispam: BCL:0; ARA:14566002|19110799003|5072599009|8060799006|461199028|3412199025|440099028|1710799026; X-Microsoft-Antispam-Message-Info: Z4phZrEtx+VfAyrLcQoNh/tksgJGztjGuX/8LbEmfmOfncBTd4H3I9mW9pw0nPMW5gFS5EPwVerwJPheiPFkD7rBoaYJ+nMrVJesqlXZxTUiLNImiO38ZiGAsZjNDB7LTkgjkvcOinvRhK0oFiJYB7O1x2vRC4CkmWTZybPKwh0r3m/Sd3f9GsOXXTeTTLtJd+EdKqCEVRweHVVwQReGQUbzlBVMfqAXhU7FvI9xmk0EK8PU4ufQXzZ+BU07Z7qQ8UGRt1sWy5CjXXMDnahKOqOpE4zIpueHQ79GksoXRhkKK1EtpruKADhaEFT61GD1E3z6upJ6XDO/CkqN5HmWzum1UuWBlOioJQYhWeZfCnNmPu0dazCh7TYcvbWbhVrFP/oaQBK61pqKY8d8lkGp3h4u4EGdoqgp29Wo0MOWEoLvk31ddFNid2RwP9AKLaZofUJw9e6DNjO2JJj3vZmUZbX1Pk7N4VZwluVnmToHnY50+Qzwb9mE6hD5LTBVwjoAsVkfBuUqV4A2FjPq0DFIMY414Avr29vmOxHJ1uBUvMwNmnnVC2nRgnkMMace72wwRmdF9q25JxoYgducSlbIt0qlM+Cfuc9PYUJzbVLFSHC9Ri8JgTSx0yVce2sZDMEz2QQNyTWV/hpUShvw6pPM1XtazNbfYOxb0bwfH3WaMuDJYzoB2DNAmau5dYT2xkocbvwucVFm62oA9rn4DjaGJQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lc40f2XX3bbCFmIkDAG5vSDqhQLMemsuzS2ZT7yqY+D202wmKDLy0ZBYgZcaIIWbjnOlFJfPJLfCRUmpcDS4HuhJzUftKOz9nMxhUmAFyC8baoYvoytTotFTnu5aoB6xdeyWijUtCPR22AivwgzKPmaq3+UURlodpN08/HcNXC2sZjzBrX5lLy7F0OmsEFJPGfdqC6Obrhle9U21/jknUPqODNDY0MYir6LOAd9QiTRvrOFUcT8Z+rlHnT6+ImND3cI+O6kWNBUkBUhpddqXIOKukRHHO8ga4bm/M+mC0So4oJBoujo9argQTzjFaUsvbWkCGb/0HvG5XHlE2rrsmjXqJF+iq1iIWRdJRLVTfsJ8/ZTSZU5er7DBGPT2r5h+VX0nMVQDn2vfr3XXyBaYyLLzn30GR6Fkwv7mCqTomjKi9aBRBz69EQqoKxB2XCSctjLkFK1j469kgEUhKN+szjVnGZUde85VZyzYU7rpRIFaajaux9iJkfNuba/xdzVD7AHVJqrlPyciJJd5iqI1zDx/5msDnC4+yxNaupfWTuQikI3eWCKSSuTF5Fljx0SVZrOqs8XcWTa8KMhkQrU+LrBMA7eRNMVmKIYYf69zM0zy4Kkxbwm2DwA6EzmYkJitCQ3qjFPThUxsOD3dDe70kkF4t6nHrVtpNdjoB4VUmCetz0bVF1LJSI6HllYORjoMgL0kOXn5XTCvRakcuXcvmQ1Kepv1bvwtNAvES2SB6+zGfG3rQp1mFO2FFIMzjCGcJaJoeLREA+fySkg3xJavjKSeH4f4FrwDeQr6bxqetsDZLHw/znTSdxizZn0Uu3kvFDGYsIpSnM1m1fG9YDSJ8pJhZWBAH9uZ3zAZUhnUeTygUKX923EmEZFmtJhSVuR40ENIfgqPvkW1yfx7e2U6NzpaPAaiwfBIsJ9f+Ofb8p2r8sd9QhnFqlygkYWGrjLXo5Lop+yKloIpc+C2FpqaFVKbgI39AV4581bOirSXuB33RjIMM08JKGV7ltsBdf5pJsk2/hvAyS4cT7auuLwvpugZABWcx97x+SD15+chu1JOu+Kq2p2jO5eNurQnDgsH0GndsomKUFQPCUjWOhkHPhZzYLEdp9u2flcP3ktMvHQjG021yg2dMXLJQ3l/GKs64A9O0kag7TuOfYr/YqeZIpQKD68PM2C/LOpFOrLudUgT/qOa9NnwoD+Qx1qr+pQFpQj+hraVaIwmdCsDO3pV3B0nSnFZz6a17P6mvTMwAVomqgPND/1T0lSTSr3HCwbM X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3f81b85a-d576-4b93-c248-08dcb683bf65 X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Aug 2024 01:53:35.0151 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA2PR84MB3934 Received-SPF: pass client-ip=40.92.19.68; envelope-from=Morgan.J.Smith@outlook.com; helo=NAM11-DM6-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * gnu/services/desktop.scm (): Allow actions to be set to 'suspend-then-hibernate'. Add configuration for 'hibernate-delay-seconds' and 'suspend-estimation-seconds'. * doc/guix.texi (Desktop Services): Add documentation for 'hibernate-delay-seconds' and 'suspend-estimation-seconds'. Change-Id: Icf788fcc88451aa6174a608fbed309961b847430 --- This patch exists so I can use and configure the suspend-then-hibernate action of elogind. This will save me the frustration of having my laptop battery die in my backpack. I tested that this produces the correct configurations. doc/guix.texi | 6 ++++++ gnu/services/desktop.scm | 15 ++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index b7eb8fd346..92ce8c2268 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -24986,6 +24986,12 @@ Desktop Services @item @code{hybrid-sleep-mode} (default: @code{'("suspend" "platform" "shutdown")}) (type: list) ... +@item @code{hibernate-delay-seconds} (default: @code{*unspecified*}) (type: integer) +... + +@item @code{suspend-estimation-seconds} (default: @code{*unspecified*}) (type: integer) +... + @end table @end deftp diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 63e2011ce3..9c4d2a1822 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -1080,7 +1080,11 @@ (define-record-type* elogind-configuration (default '("disk"))) (hybrid-sleep-mode elogind-hybrid-sleep-mode (default - '("suspend" "platform" "shutdown")))) + '("suspend" "platform" "shutdown"))) + (hibernate-delay-seconds elogind-hibernate-delay-seconds + (default *unspecified*)) + (suspend-estimation-seconds elogind-suspend-estimation-seconds + (default *unspecified*))) (define (elogind-configuration-file config) (define (yesno x) @@ -1104,8 +1108,11 @@ (define (elogind-configuration-file config) (unless (exact-integer? x) (error "not an integer" x)) (when (negative? x) (error "negative number not allowed" x)) (number->string x)) + (define (maybe-non-negative-integer x) + (or (and (unspecified? x) x) + (non-negative-integer x))) (define handle-actions - '(ignore poweroff reboot halt kexec suspend hibernate hybrid-sleep lock)) + '(ignore poweroff reboot halt kexec suspend hibernate hybrid-sleep suspend-then-hibernate lock)) (define (handle-action x) (if (unspecified? x) x ;let the unspecified value go through @@ -1163,7 +1170,9 @@ (define (elogind-configuration-file config) ("HibernateState" (sleep-list elogind-hibernate-state)) ("HibernateMode" (sleep-list elogind-hibernate-mode)) ("HybridSleepState" (sleep-list elogind-hybrid-sleep-state)) - ("HybridSleepMode" (sleep-list elogind-hybrid-sleep-mode)))) + ("HybridSleepMode" (sleep-list elogind-hybrid-sleep-mode)) + ("HibernateDelaySec" (maybe-non-negative-integer elogind-hibernate-delay-seconds)) + ("SuspendEstimationSec" (maybe-non-negative-integer elogind-suspend-estimation-seconds)))) (define (elogind-dbus-service config) "Return a @file{org.freedesktop.login1.service} file that tells D-Bus how to -- 2.45.2 From unknown Sun Jun 22 07:57:14 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#72504] QA review for 72504 References: In-Reply-To: Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 15 Aug 2024 15:17:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72504 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: control@debbugs.gnu.org,72504@debbugs.gnu.org Received: via spool by 72504-submit@debbugs.gnu.org id=B72504.17237349822825 (code B ref 72504); Thu, 15 Aug 2024 15:17:03 +0000 Received: (at 72504) by debbugs.gnu.org; 15 Aug 2024 15:16:22 +0000 Received: from localhost ([127.0.0.1]:49531 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1secD7-0000jU-SV for submit@debbugs.gnu.org; Thu, 15 Aug 2024 11:16:22 -0400 Received: from 4.mo560.mail-out.ovh.net ([87.98.172.75]:58591) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1secD4-0000jD-R8 for 72504@debbugs.gnu.org; Thu, 15 Aug 2024 11:16:20 -0400 Received: from director6.ghost.mail-out.ovh.net (unknown [10.109.139.72]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id 4Wl7wr5yktz1TMv for <72504@debbugs.gnu.org>; Thu, 15 Aug 2024 15:15:40 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-gj56x (unknown [10.110.188.214]) by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 46EBA1FD48; Thu, 15 Aug 2024 15:15:39 +0000 (UTC) Received: from ngraves.fr ([37.59.142.102]) by ghost-submission-6684bf9d7b-gj56x with ESMTPSA id ngkmNpsbvmZvaRwAu//YcQ (envelope-from ); Thu, 15 Aug 2024 15:15:39 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-102R004e1050161-ec23-42c4-a878-cec88d948d48, F32C19C47665EA1857B9600CE3BE07B773229FBC) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 From: Nicolas Graves Date: Thu, 15 Aug 2024 17:15:39 +0200 Message-ID: <8734n5es10.fsf@ngraves.fr> MIME-Version: 1.0 Content-Type: text/plain X-Ovh-Tracer-Id: 1989465139006464683 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddruddtiedgkeeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvffufffkgggtsehttdertddttddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepueejleeileejfffhleetjedtleejheevudffleevgfdufeekhefgvddvveegveefnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugeeirddvtdekpdefjedrheelrddugedvrddutddvnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejvdehtdegseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedtpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=uByjZIlECrFAhUiNSXO+k8HQKxCoCvrNDP22epFq1DM=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1723734941; v=1; b=K+TBnsbmi/M87eh4CknXuIiqim8UM8oruteShdpSWQ2toiTKb3fAGedV7o6x7fEBpKhjIylr KL0m8oOJpnmDflLkvGS7xvRXLlpwCLvhtM79KdassiK90odMcncVcVcRX60hok9JFIkrtn37/zm orbmVdrqAVA3X3T2hRWaJlQC6RzOzPewNUqxItKBsFwTpkxL/UgjCFL5T1Wv1Bi1mz9RfDtA6K3 w//umDs8NxC5HRCH/r/5MUsoy1nakSnhnYXi+34q1hOnYVqDTRwR67m1GzoCSX1ZkNLSJWDQGqS LbUB5J8Zbh3VDcBpGAP8fdHjkGVUuZAyTCWsgDEoazJWA== X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) user guix usertag 72504 + reviewed-looks-good thanks Guix QA review form submission: LGTM. No service test associed yet to elogind so cannot be tested against a mock configuration. Items marked as checked: Lint warnings, Package builds, Commit messages -- Best regards, Nicolas Graves From unknown Sun Jun 22 07:57:14 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Morgan Smith Subject: bug#72504: closed (Re: [bug#72504] [PATCH] services: elogind-configuration: Add more sleep configurations) Message-ID: References: <87y14preuz.fsf@gnu.org> X-Gnu-PR-Message: they-closed 72504 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 72504@debbugs.gnu.org Date: Wed, 21 Aug 2024 17:01:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1724259662-5515-1" This is a multi-part message in MIME format... ------------=_1724259662-5515-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #72504: [PATCH] services: elogind-configuration: Add more sleep configurati= ons which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 72504@debbugs.gnu.org. --=20 72504: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D72504 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1724259662-5515-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 72504-done) by debbugs.gnu.org; 21 Aug 2024 17:00:46 +0000 Received: from localhost ([127.0.0.1]:36229 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sgohR-0001QM-Jw for submit@debbugs.gnu.org; Wed, 21 Aug 2024 13:00:45 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41298) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sgohO-0001Q5-UD for 72504-done@debbugs.gnu.org; Wed, 21 Aug 2024 13:00:44 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sgogZ-0001Gj-T8; Wed, 21 Aug 2024 12:59:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=ZwKidJofTNbVqFED9i8qGVoqFSLRMLSKWZ9F1J55ZnY=; b=fYcqvrjm9TUfBdlVtifD 6Ep5nZiTWFr2ppeVdrE9v95SnENVzmm3oPaLPPipT2FImZ71cSRP1PMTMC7GQ6jHQTOFt4tMmywO9 p/hH333M7UeA558k5hcdOsk04OIKAEl/EbuieX2xITaSUNzs2IsI6DNQKs0MCCcAV7c7+aQ7W6Siq wU7RRbmCzL2/HHVn2ZLnbvimILHZkaE6QRA+dET+jhGoiuVCleoDSgcfxbsak3vbvHrnbyLkUKGVY BkqIhAElpy4HwDXUNq247PUhBW+g5eRyQXbFgwW+Ilvc4/rKK6qUM4Z2EHxUd7SDk/mtnKqj31Y/7 gtB5Zm2XDnoNtg==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Morgan Smith Subject: Re: [bug#72504] [PATCH] services: elogind-configuration: Add more sleep configurations In-Reply-To: (Morgan Smith's message of "Tue, 6 Aug 2024 21:51:37 -0400") References: Date: Wed, 21 Aug 2024 18:59:48 +0200 Message-ID: <87y14preuz.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 72504-done Cc: Maxim Cournoyer , 72504-done@debbugs.gnu.org, Matthew Trzcinski , Florian Pelz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Morgan Smith skribis: > * gnu/services/desktop.scm (): Allow actions to be= set > to 'suspend-then-hibernate'. Add configuration for 'hibernate-delay-seco= nds' > and 'suspend-estimation-seconds'. > > * doc/guix.texi (Desktop Services): Add documentation for > 'hibernate-delay-seconds' and 'suspend-estimation-seconds'. > > Change-Id: Icf788fcc88451aa6174a608fbed309961b847430 Applied, thanks! (And thank you, Nicolas!) > This patch exists so I can use and configure the suspend-then-hibernate a= ction > of elogind. This will save me the frustration of having my laptop batter= y die > in my backpack. Makes sense. :-) Ludo=E2=80=99. ------------=_1724259662-5515-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 7 Aug 2024 01:59:08 +0000 Received: from localhost ([127.0.0.1]:33395 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbVxD-00017o-UF for submit@debbugs.gnu.org; Tue, 06 Aug 2024 21:59:08 -0400 Received: from lists.gnu.org ([209.51.188.17]:56320) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbVxB-00017g-VY for submit@debbugs.gnu.org; Tue, 06 Aug 2024 21:59:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sbVwn-0002x2-6h for guix-patches@gnu.org; Tue, 06 Aug 2024 21:58:41 -0400 Received: from mail-dm6nam11olkn2068.outbound.protection.outlook.com ([40.92.19.68] helo=NAM11-DM6-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sbVwl-0006ql-7V for guix-patches@gnu.org; Tue, 06 Aug 2024 21:58:40 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Sfoa6KaRGpHanq9NxgX41tGBzLFPic6yWa+eJQ3v9ISD44yDrwd94bIUr6fjEuxbu1TmLJ5rPrvyZPEBycT6qOXiGu2IWGXOmXXPxXrWYU9QWXJN+j2N9BZfz4HzOyFcHU07NYALb2571Vy9h89AbFt6tDi2b5n5tr1AhuER4Ue4Ba8ppKaf65uliv8jaNS0Q3/rGy2TW9EFcdHM1m1+CwQYYqMTkM3DstN7kNgX0XamAS/IFWBAKqmMde4GISQRRHrpo+5tCnL9gp6bLgofHtO372EmLuPMCOTcYWLqpNRLvOVEIWGluj/j2wzMswWEeTbghqTue1rp7yIltjQqRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=rCJXbq28FZLHJYAhBT1A7o80dM6c1OnhPGqhIF7SeMw=; b=IE2cGyc8rExV4aU3VKtCHW7iHgVHyUYpbfxP4NTNfE5GV2kfZdyUSqV2QJlev+KqVuUGUqKkgd+LFf7ync76oo25b4ywQhZe3h/weLnQoO0gbrN7TdePY5QkU1slwKFYVq/bH8vol9U3SoXUUl3gprkSLEVNSNZDt72NtmtPTliaURSKG0aFag1jsLB3c9q3RSSZqLdzp656Ge6EE9A7CLqSnTEFvEpivzO0nP8Y7yv3iImhEwkevsIKLN/svsTcR2yZQETOb0E6kZRgcEnNbhh5o2/hMWJf02xhNqnwXUpNWWKdEZWcB8vXVp2AqmE1RY/tA/lps4PMlF1qWG9vdQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rCJXbq28FZLHJYAhBT1A7o80dM6c1OnhPGqhIF7SeMw=; b=jcwvUZ5WjrUVsGhzNoq4THBRc0qAWdSK9hgYI90i2Xw1WxOdqsOyixzX064CNYQsF5Uw0DTchcxanJxRyJuNw7l2hCRwIogPIL4aRNtSOU9iDc2e/Dh0HONHb8JXK4tkFersStryte+oZ+eeeIUbKdxV6bSnRpJ6sAQ5y51DAVmzIoir4305gezYwWeSXGUUFGwkQclbHYRzIOrSKj4wI4p9ly+npMkVJ0I1qqMZ1UG8JINlJgjXDUJ0cD4iU7MbxcvJfHO+d0aPth7xe0JSf/Ohr7gl3axMKMfKaUWkVzOIVLXyWAg9yOzKIB7kl2jYw/ORq+d/BocWlojh4KU7ww== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by IA2PR84MB3934.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:208:4af::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.23; Wed, 7 Aug 2024 01:53:35 +0000 Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef]) by CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef%7]) with mapi id 15.20.7828.023; Wed, 7 Aug 2024 01:53:35 +0000 From: Morgan Smith To: guix-patches@gnu.org Subject: [PATCH] services: elogind-configuration: Add more sleep configurations Date: Tue, 6 Aug 2024 21:51:37 -0400 Message-ID: X-Mailer: git-send-email 2.45.2 X-Debbugs-Cc: Florian Pelz , Ludovic Courtès , Matthew Trzcinski , Maxim Cournoyer Content-Transfer-Encoding: 8bit Content-Type: text/plain X-TMN: [VCtFptXl11MvvRWma7lJKdV6JX0QDxqI] X-ClientProxiedBy: YT4PR01CA0347.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:fc::18) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|IA2PR84MB3934:EE_ X-MS-Office365-Filtering-Correlation-Id: 3f81b85a-d576-4b93-c248-08dcb683bf65 X-Microsoft-Antispam: BCL:0; ARA:14566002|19110799003|5072599009|8060799006|461199028|3412199025|440099028|1710799026; X-Microsoft-Antispam-Message-Info: Z4phZrEtx+VfAyrLcQoNh/tksgJGztjGuX/8LbEmfmOfncBTd4H3I9mW9pw0nPMW5gFS5EPwVerwJPheiPFkD7rBoaYJ+nMrVJesqlXZxTUiLNImiO38ZiGAsZjNDB7LTkgjkvcOinvRhK0oFiJYB7O1x2vRC4CkmWTZybPKwh0r3m/Sd3f9GsOXXTeTTLtJd+EdKqCEVRweHVVwQReGQUbzlBVMfqAXhU7FvI9xmk0EK8PU4ufQXzZ+BU07Z7qQ8UGRt1sWy5CjXXMDnahKOqOpE4zIpueHQ79GksoXRhkKK1EtpruKADhaEFT61GD1E3z6upJ6XDO/CkqN5HmWzum1UuWBlOioJQYhWeZfCnNmPu0dazCh7TYcvbWbhVrFP/oaQBK61pqKY8d8lkGp3h4u4EGdoqgp29Wo0MOWEoLvk31ddFNid2RwP9AKLaZofUJw9e6DNjO2JJj3vZmUZbX1Pk7N4VZwluVnmToHnY50+Qzwb9mE6hD5LTBVwjoAsVkfBuUqV4A2FjPq0DFIMY414Avr29vmOxHJ1uBUvMwNmnnVC2nRgnkMMace72wwRmdF9q25JxoYgducSlbIt0qlM+Cfuc9PYUJzbVLFSHC9Ri8JgTSx0yVce2sZDMEz2QQNyTWV/hpUShvw6pPM1XtazNbfYOxb0bwfH3WaMuDJYzoB2DNAmau5dYT2xkocbvwucVFm62oA9rn4DjaGJQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?lc40f2XX3bbCFmIkDAG5vSDqhQLMemsuzS2ZT7yqY+D202wmKDLy0ZBYgZca?= =?us-ascii?Q?IIWbjnOlFJfPJLfCRUmpcDS4HuhJzUftKOz9nMxhUmAFyC8baoYvoytTotFT?= =?us-ascii?Q?nu5aoB6xdeyWijUtCPR22AivwgzKPmaq3+UURlodpN08/HcNXC2sZjzBrX5l?= =?us-ascii?Q?Ly7F0OmsEFJPGfdqC6Obrhle9U21/jknUPqODNDY0MYir6LOAd9QiTRvrOFU?= =?us-ascii?Q?cT8Z+rlHnT6+ImND3cI+O6kWNBUkBUhpddqXIOKukRHHO8ga4bm/M+mC0So4?= =?us-ascii?Q?oJBoujo9argQTzjFaUsvbWkCGb/0HvG5XHlE2rrsmjXqJF+iq1iIWRdJRLVT?= =?us-ascii?Q?fsJ8/ZTSZU5er7DBGPT2r5h+VX0nMVQDn2vfr3XXyBaYyLLzn30GR6Fkwv7m?= =?us-ascii?Q?CqTomjKi9aBRBz69EQqoKxB2XCSctjLkFK1j469kgEUhKN+szjVnGZUde85V?= =?us-ascii?Q?ZyzYU7rpRIFaajaux9iJkfNuba/xdzVD7AHVJqrlPyciJJd5iqI1zDx/5msD?= =?us-ascii?Q?nC4+yxNaupfWTuQikI3eWCKSSuTF5Fljx0SVZrOqs8XcWTa8KMhkQrU+LrBM?= =?us-ascii?Q?A7eRNMVmKIYYf69zM0zy4Kkxbwm2DwA6EzmYkJitCQ3qjFPThUxsOD3dDe70?= =?us-ascii?Q?kkF4t6nHrVtpNdjoB4VUmCetz0bVF1LJSI6HllYORjoMgL0kOXn5XTCvRakc?= =?us-ascii?Q?uXcvmQ1Kepv1bvwtNAvES2SB6+zGfG3rQp1mFO2FFIMzjCGcJaJoeLREA+fy?= =?us-ascii?Q?Skg3xJavjKSeH4f4FrwDeQr6bxqetsDZLHw/znTSdxizZn0Uu3kvFDGYsIpS?= =?us-ascii?Q?nM1m1fG9YDSJ8pJhZWBAH9uZ3zAZUhnUeTygUKX923EmEZFmtJhSVuR40ENI?= =?us-ascii?Q?fgqPvkW1yfx7e2U6NzpaPAaiwfBIsJ9f+Ofb8p2r8sd9QhnFqlygkYWGrjLX?= =?us-ascii?Q?o5Lop+yKloIpc+C2FpqaFVKbgI39AV4581bOirSXuB33RjIMM08JKGV7ltsB?= =?us-ascii?Q?df5pJsk2/hvAyS4cT7auuLwvpugZABWcx97x+SD15+chu1JOu+Kq2p2jO5eN?= =?us-ascii?Q?urQnDgsH0GndsomKUFQPCUjWOhkHPhZzYLEdp9u2flcP3ktMvHQjG021yg2d?= =?us-ascii?Q?MXLJQ3l/GKs64A9O0kag7TuOfYr/YqeZIpQKD68PM2C/LOpFOrLudUgT/qOa?= =?us-ascii?Q?9NnwoD+Qx1qr+pQFpQj+hraVaIwmdCsDO3pV3B0nSnFZz6a17P6mvTMwAVom?= =?us-ascii?Q?qgPND/1T0lSTSr3HCwbM?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3f81b85a-d576-4b93-c248-08dcb683bf65 X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Aug 2024 01:53:35.0151 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA2PR84MB3934 Received-SPF: pass client-ip=40.92.19.68; envelope-from=Morgan.J.Smith@outlook.com; helo=NAM11-DM6-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Morgan Smith X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * gnu/services/desktop.scm (): Allow actions to be set to 'suspend-then-hibernate'. Add configuration for 'hibernate-delay-seconds' and 'suspend-estimation-seconds'. * doc/guix.texi (Desktop Services): Add documentation for 'hibernate-delay-seconds' and 'suspend-estimation-seconds'. Change-Id: Icf788fcc88451aa6174a608fbed309961b847430 --- This patch exists so I can use and configure the suspend-then-hibernate action of elogind. This will save me the frustration of having my laptop battery die in my backpack. I tested that this produces the correct configurations. doc/guix.texi | 6 ++++++ gnu/services/desktop.scm | 15 ++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index b7eb8fd346..92ce8c2268 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -24986,6 +24986,12 @@ Desktop Services @item @code{hybrid-sleep-mode} (default: @code{'("suspend" "platform" "shutdown")}) (type: list) ... +@item @code{hibernate-delay-seconds} (default: @code{*unspecified*}) (type: integer) +... + +@item @code{suspend-estimation-seconds} (default: @code{*unspecified*}) (type: integer) +... + @end table @end deftp diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 63e2011ce3..9c4d2a1822 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -1080,7 +1080,11 @@ (define-record-type* elogind-configuration (default '("disk"))) (hybrid-sleep-mode elogind-hybrid-sleep-mode (default - '("suspend" "platform" "shutdown")))) + '("suspend" "platform" "shutdown"))) + (hibernate-delay-seconds elogind-hibernate-delay-seconds + (default *unspecified*)) + (suspend-estimation-seconds elogind-suspend-estimation-seconds + (default *unspecified*))) (define (elogind-configuration-file config) (define (yesno x) @@ -1104,8 +1108,11 @@ (define (elogind-configuration-file config) (unless (exact-integer? x) (error "not an integer" x)) (when (negative? x) (error "negative number not allowed" x)) (number->string x)) + (define (maybe-non-negative-integer x) + (or (and (unspecified? x) x) + (non-negative-integer x))) (define handle-actions - '(ignore poweroff reboot halt kexec suspend hibernate hybrid-sleep lock)) + '(ignore poweroff reboot halt kexec suspend hibernate hybrid-sleep suspend-then-hibernate lock)) (define (handle-action x) (if (unspecified? x) x ;let the unspecified value go through @@ -1163,7 +1170,9 @@ (define (elogind-configuration-file config) ("HibernateState" (sleep-list elogind-hibernate-state)) ("HibernateMode" (sleep-list elogind-hibernate-mode)) ("HybridSleepState" (sleep-list elogind-hybrid-sleep-state)) - ("HybridSleepMode" (sleep-list elogind-hybrid-sleep-mode)))) + ("HybridSleepMode" (sleep-list elogind-hybrid-sleep-mode)) + ("HibernateDelaySec" (maybe-non-negative-integer elogind-hibernate-delay-seconds)) + ("SuspendEstimationSec" (maybe-non-negative-integer elogind-suspend-estimation-seconds)))) (define (elogind-dbus-service config) "Return a @file{org.freedesktop.login1.service} file that tells D-Bus how to -- 2.45.2 ------------=_1724259662-5515-1--