From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id uJgmFXAmxWAi5AAAgWs5BA (envelope-from ) for ; Sat, 12 Jun 2021 23:26:08 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id mPBSEHAmxWAYMQAA1q6Kng (envelope-from ) for ; Sat, 12 Jun 2021 21:26:08 +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 0AD8D21792 for ; Sat, 12 Jun 2021 23:26:08 +0200 (CEST) Received: from localhost ([::1]:58272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsB8p-00069D-3Q for larch@yhetil.org; Sat, 12 Jun 2021 17:26:07 -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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+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=1623533168; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: 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=ztAt/cV3vxsSXuNbYbbF67yNZgxyuc5tTzGx9f3jTKY=; b=AA0fmQ9+7lGefi6X3kBIAyHGtauYmvo5YkETQShg+155kw1XogOGRy2wU08OzbfNcIV38f SI8cHFwPLs1T15UuVk9t6fy4tjwhQKl5+z/2WRt2oIk0A71Cv5KReRyGURzEC0E5efLJR9 BEISmhl3LmegWj/rYmeU305ZkXLja79RToBxCMJFkfH00H4vdL5wkLDefGF/bKk9jmVxv/ ovubahx3vBhYY49YwowuYcOKuSf+6zJNCsMEAO3cJgKky+82/bXSX8svfHM9yBZlx94yZq 34IbjjbR7EFpd3EcU9xo1L3vQo/zUp9spt33ZftPZwkwFQhhdxVYdnpAK/AeGw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1623533168; a=rsa-sha256; cv=none; b=rc3ZJ8VSolCtokrs6m4l6CmpEur55fLGkrIO5PvmZsOHbMrszM8sgu43scLZ2Kq8tuy2TV j5XRy97wr/2XszGqvrbPrYbPXP/AzE7pr2x2JqRHXD1x77m40ddsZZKkYao6xHTKKJ3i1d DgKas9c9WjslOiunKCoGovGfrinkAbIJKAqcPvijAAXvzTYF/u7nYk9yb/gSSzwDNJRLT2 oZ6A8uXVsW737rDPI+sb9bjsRmH6n5QePPhwhbRp9Ulq8qiIVTif8trnwLnFUfAetYr/A1 TNml9qyBMcjf2MpCgkR79SEajCN0wKJ8tVSNgqb3hXhWGQEelW6vb2iEpd77+w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=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: 0.07 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: 0AD8D21792 X-Spam-Score: 0.07 X-Migadu-Scanner: scn1.migadu.com X-TUID: 86Im30Vl0slT 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))))))) -- 2.31.1