bug#48987: closed ([PATCH] services: pcscd: Cleanup socket when started.)

[GNU bug Tracking System]

Your message dated Sat, 19 Jun 2021 23:50:58 +0200
with message-id <871r8xy14t.fsf_-_@waegenei.re>
and subject line Re: bug#48987: [PATCH] services: pcscd: Cleanup socket when 
started.
has caused the debbugs.gnu.org bug report #48987,
regarding [PATCH] services: pcscd: Cleanup socket when started.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
48987: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=48987
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] services: pcscd: Cleanup socket when started.
>
>
>
>
> Date: 
>
> Sat, 12 Jun 2021 23:24:58 +0200
>
>
>
>
> 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 <arunisaac@systemreboot.net>
>  ;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
> +;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
>  ;;;
>  ;;; 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
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: bug#48987: [PATCH] services: pcscd: Cleanup socket when started.
>
>
>
>
> Date: 
>
> Sat, 19 Jun 2021 23:50:58 +0200
>
>
>
>
> User-agent: 
>
> Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux)
>
>
>
>
> Ludo',
>
> Ludovic Courtès <ludo@gnu.org> writes:
>
> > Brice Waegeneire <brice@waegenei.re> skribis:
> >
> >> * gnu/services/security-token.scm (pcscd-shepherd-service)[start]:
> >> Remove existing socket file.
> >
> > LGTM, thanks!
>
> Pushed as 4bed8486d4c0a4ff142903b8bc1584ce84767355.
>
> Cheers,
> - Brice
>
>
> --- End Message ---