From patchwork Sat Jun 12 21:24:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brice Waegeneire X-Patchwork-Id: 30202 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E4ADC27BC81; Sat, 12 Jun 2021 22:26:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B3E7227BC78 for ; Sat, 12 Jun 2021 22:26:09 +0100 (BST) Received: from localhost ([::1]:58272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsB8q-00069D-Re for patchwork@mira.cbaines.net; Sat, 12 Jun 2021 17:26:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34648) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsB8k-00068q-6O for guix-patches@gnu.org; Sat, 12 Jun 2021 17:26:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58940) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsB8j-000367-VC for guix-patches@gnu.org; Sat, 12 Jun 2021 17:26:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsB8j-0008Th-Sg for guix-patches@gnu.org; Sat, 12 Jun 2021 17:26:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48987] [PATCH] services: pcscd: Cleanup socket when started. Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 12 Jun 2021 21:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48987 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48987@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162353310432479 (code B ref -1); Sat, 12 Jun 2021 21:26:01 +0000 Received: (at submit) by debbugs.gnu.org; 12 Jun 2021 21:25:04 +0000 Received: from localhost ([127.0.0.1]:42251 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsB7o-0008Rc-1Y for submit@debbugs.gnu.org; Sat, 12 Jun 2021 17:25:04 -0400 Received: from lists.gnu.org ([209.51.188.17]:44674) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsB7m-0008Qz-HV for submit@debbugs.gnu.org; Sat, 12 Jun 2021 17:25:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34466) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsB7m-0005Gr-AT for guix-patches@gnu.org; Sat, 12 Jun 2021 17:25:02 -0400 Received: from relay6-d.mail.gandi.net ([217.70.183.198]:53499) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsB7k-0002K6-Nx for guix-patches@gnu.org; Sat, 12 Jun 2021 17:25:02 -0400 Received: (Authenticated sender: brice@waegenei.re) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id DA3E8C0004 for ; Sat, 12 Jun 2021 21:24:58 +0000 (UTC) From: Brice Waegeneire Date: Sat, 12 Jun 2021 23:24:58 +0200 Message-Id: <20210612212458.13456-1-brice@waegenei.re> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Received-SPF: pass client-ip=217.70.183.198; envelope-from=brice@waegenei.re; helo=relay6-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_H3=0.001, RCVD_IN_MSPIKE_WL=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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Otherwise when pcscd doesn't terminate properly (ie. receive a SIGKILL), it won't start again because of it's socket already existing. * gnu/services/security-token.scm (pcscd-shepherd-service)[start]: Remove existing socket file. --- gnu/services/security-token.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/services/security-token.scm b/gnu/services/security-token.scm index ec26006538..0cbb591e10 100644 --- a/gnu/services/security-token.scm +++ b/gnu/services/security-token.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2020 Tobias Geerinckx-Rice +;;; Copyright © 2021 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -57,6 +58,9 @@ (requirement '(syslogd)) (modules '((gnu build shepherd))) (start #~(lambda _ + (let ((socket "/run/pcscd/pcscd.comm")) + (when (file-exists? socket) + (delete-file socket))) (invoke #$(file-append pcsc-lite "/sbin/pcscd")) (call-with-input-file "/run/pcscd/pcscd.pid" read))) (stop #~(make-kill-destructor)))))))