From patchwork Mon Jun 13 12:15:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 39940 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 40BBC27BBEA; Mon, 13 Jun 2022 13:20:51 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E2C9F27BBE9 for ; Mon, 13 Jun 2022 13:20:50 +0100 (BST) Received: from localhost ([::1]:44038 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o0j3p-0000A6-VX for patchwork@mira.cbaines.net; Mon, 13 Jun 2022 08:20:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44354) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o0izD-0003yn-4u for guix-patches@gnu.org; Mon, 13 Jun 2022 08:16:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35325) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o0izC-0008Ld-Po for guix-patches@gnu.org; Mon, 13 Jun 2022 08:16:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o0izC-0004DR-MA for guix-patches@gnu.org; Mon, 13 Jun 2022 08:16:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55941] [PATCH core-updates 3/3] services: pcscd: Use switch-symlinks from (guix build utils). Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 13 Jun 2022 12:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55941 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55941@debbugs.gnu.org, Maxime Devos Cc: Arun Isaac Received: via spool by 55941-submit@debbugs.gnu.org id=B55941.165512254616163 (code B ref 55941); Mon, 13 Jun 2022 12:16:02 +0000 Received: (at 55941) by debbugs.gnu.org; 13 Jun 2022 12:15:46 +0000 Received: from localhost ([127.0.0.1]:57451 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o0iys-0004CT-R3 for submit@debbugs.gnu.org; Mon, 13 Jun 2022 08:15:46 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:46414) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o0iye-0004Br-Mf for 55941@debbugs.gnu.org; Mon, 13 Jun 2022 08:15:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=VbqhoA6ff8iWGT2D2kFiygOwvvstSXmjUx4dA3fPRm4=; b=pjHPDLq9EljxT5Fwe/2pXL7Kz9 b7HEMwqIKNoPNIUB19k8AGUhkcLBywwMHvs80eQnnqFClJP/aYAnLqniRfFD7PBQeJmWuyd0EITrA OgND1HtFUylWAqGCkUpTq8qD0bosxpwo1C/cTLzM3vAkhLTrMTgoDAmr0wVSBcLYqpdYyFUkgghwV ZbA3WkcdcVEiI7vA/3Rv5mOTgMG38+78haTDFDherhBRE6rObVnCNoGE4EkHJaFJSKJX6PUSa6U91 9UI13ujDfi2T0ZFVKdTrMJ1ABuXBuAw+4F1gYdqZVa2kRfTFGN0RqJ74F0hHGHOcYrUlVcIZYJERz hyJ4zqAw==; Received: from [192.168.2.1] (port=5296 helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1o0iyb-0004fy-Oa; Mon, 13 Jun 2022 17:45:25 +0530 From: Arun Isaac Date: Mon, 13 Jun 2022 17:45:23 +0530 Message-Id: <20220613121523.20327-3-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220613121523.20327-1-arunisaac@systemreboot.net> References: <20220613121523.20327-1-arunisaac@systemreboot.net> MIME-Version: 1.0 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 switch-symlinks has been moved to (guix build utils). We need not duplicate it anymore. * gnu/services/security-token.scm (pcscd-activation): Use switch-symlinks from (guix build utils). --- gnu/services/security-token.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/gnu/services/security-token.scm b/gnu/services/security-token.scm index 52afad84a6..2356273398 100644 --- a/gnu/services/security-token.scm +++ b/gnu/services/security-token.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2018 Arun Isaac +;;; Copyright © 2018, 2022 Arun Isaac ;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; Copyright © 2021 Brice Waegeneire ;;; @@ -74,12 +74,7 @@ (define pcscd-activation '((guix build utils))) #~(begin (use-modules (guix build utils)) - ;; XXX: We can't use (guix utils) because it requires a - ;; dynamically-linked Guile, hence the duplicate switch-symlinks. - (define (switch-symlinks link target) - (let ((pivot (string-append link ".new"))) - (symlink target pivot) - (rename-file pivot link))) + (mkdir-p "/var/lib") (switch-symlinks "/var/lib/pcsc" #$(directory-union