From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id +L7sGmXL4GDoEAEAgWs5BA (envelope-from ) for ; Sat, 03 Jul 2021 22:41:09 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 2DOmFmXL4GBYZAAA1q6Kng (envelope-from ) for ; Sat, 03 Jul 2021 20:41:09 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 20B9318769 for ; Sat, 3 Jul 2021 22:41:09 +0200 (CEST) Received: from localhost ([::1]:44342 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzmRo-0007yw-5j for larch@yhetil.org; Sat, 03 Jul 2021 16:41:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51688) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzmRi-0007yn-JR for guix-patches@gnu.org; Sat, 03 Jul 2021 16:41:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56641) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzmRi-0002m5-8l for guix-patches@gnu.org; Sat, 03 Jul 2021 16:41:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lzmRi-0003u0-7j for guix-patches@gnu.org; Sat, 03 Jul 2021 16:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49365] [PATCH] services: gpm: Use "make-forkexec-contstructor". Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 03 Jul 2021 20:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49365 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49365@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162534483714955 (code B ref -1); Sat, 03 Jul 2021 20:41:02 +0000 Received: (at submit) by debbugs.gnu.org; 3 Jul 2021 20:40:37 +0000 Received: from localhost ([127.0.0.1]:39954 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzmRI-0003t9-RJ for submit@debbugs.gnu.org; Sat, 03 Jul 2021 16:40:37 -0400 Received: from lists.gnu.org ([209.51.188.17]:60062) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzmRG-0003t1-Nz for submit@debbugs.gnu.org; Sat, 03 Jul 2021 16:40:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51614) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzmRG-0007xk-GQ for guix-patches@gnu.org; Sat, 03 Jul 2021 16:40:34 -0400 Received: from relay5-d.mail.gandi.net ([217.70.183.197]:43745) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzmRF-0002SA-1g for guix-patches@gnu.org; Sat, 03 Jul 2021 16:40:34 -0400 Received: (Authenticated sender: brice@waegenei.re) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 3BB741C0006 for ; Sat, 3 Jul 2021 20:40:30 +0000 (UTC) From: Brice Waegeneire Date: Sat, 3 Jul 2021 22:40:28 +0200 Message-Id: <20210703204028.11582-1-brice@waegenei.re> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=217.70.183.197; envelope-from=brice@waegenei.re; helo=relay5-d.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1625344869; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=BrgWQp4W7Y5a5DiUihhVZD8NsnbblVoX4ifeb/CIXSg=; b=F6BTDu3mRSgPMWegHWiFOY/O6T8CMvZU7wHuIFHDrLvgHMMJhUZpfSVd51jVf/XmyE/qlJ Xyl/RKQRoVILpd5Y/4MFG6VmExLGHCdNTrdL6s7qNQp1KxvJiaK+9ldj9ItFv0wNl1uZn2 vUVSffyX+CUPTltI/m4lX3bPHSY0eRwqjvMXwS1+JA6NTqh8HXxWUipvLsw6/b/0VTrW6W QGEiRMlDek4GoVJbBoPEnPcb0i7PFE0NXqeTAcJCwLtPGzcEVRglvgXm7Vrn1JsElAl9aJ 4hARiUJI3Ru5C6MNXuS9HCs26B9Q1QiCM2nDoU4UIttHTwBmPbhcVJ5HxDny1Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1625344869; a=rsa-sha256; cv=none; b=LCTXZw3/j1eBt1hY/hdk+ftR1ErWKucqZjxVk6SEYPqmfS6frU6Hx0X76rLOwd6UK3mhO6 W5OourDflTJ0zBMX4xbfp2YesLlIGPShdWz6WzkYfCP6/TogcX+7Jp0kbm2oqlVpXGUfvk GxT0T6+Vau48UBLP6d7OIix0sczLvuSY2DcQwwjyFRImv7hjJ7IYKO+4P0iI8pqBo5P+bc zNAcbTEwo6OXSAFwLDyUVcsxdwdaqcgn5OW1gEAjz9iJiJLz6ajzv1RqbSBC5Pb3dYTMEy jo/7AsZMLpnsOkYMNXFdbXQvEkml75OB290F/dqSM92xL32sgnBp49vU41H76A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 2.59 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 20B9318769 X-Spam-Score: 2.59 X-Migadu-Scanner: scn1.migadu.com X-TUID: QnJllRZKy35n * gnu/services/base.scm (gpm-shepherd-service)[start]: Replace custom logic with "make-forkexec-constructor". --- gnu/services/base.scm | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 6922d7f90b..ab3e441a7b 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -2217,23 +2217,13 @@ instance." (list (shepherd-service (requirement '(udev)) (provision '(gpm)) - (start #~(lambda () - ;; 'gpm' runs in the background and sets a PID file. - ;; Note that it requires running as "root". - (false-if-exception (delete-file "/var/run/gpm.pid")) - (fork+exec-command (list #$(file-append gpm "/sbin/gpm") - #$@options)) - - ;; Wait for the PID file to appear; declare failure if - ;; it doesn't show up. - (let loop ((i 3)) - (or (file-exists? "/var/run/gpm.pid") - (if (zero? i) - #f - (begin - (sleep 1) - (loop (1- i)))))))) - + ;; 'gpm' runs in the background and sets a PID file. + ;; Note that it requires running as "root". + (start #~(make-forkexec-constructor + (list #$(file-append gpm "/sbin/gpm") + #$@options) + #:pid-file "/var/run/gpm.pid" + #:pid-file-timeout 3)) (stop #~(lambda (_) ;; Return #f if successfully stopped. (not (zero? (system* #$(file-append gpm "/sbin/gpm") -- 2.31.1