From patchwork Fri Nov 8 14:10:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Boilleau X-Patchwork-Id: 70149 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 5C09027BBE9; Fri, 8 Nov 2024 18:46:39 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 8AE8227BBE2 for ; Fri, 8 Nov 2024 18:46:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t9Tzj-0003FZ-2A; Fri, 08 Nov 2024 13:46:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t9Tzf-0003ED-4s for guix-patches@gnu.org; Fri, 08 Nov 2024 13:46:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t9Tze-0007jP-SB for guix-patches@gnu.org; Fri, 08 Nov 2024 13:46:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=862NZUM707SZJFoROMhU5edXDBjNqbImESMZv4G0jhM=; b=MgVGUMHZmv844EXNFvhfspWINVlWHgw3b7T1+SsWNNvirLcAA3j7XI7G+Sx6Ihd+CG8OMfUprF4kgUnVF+VRngy5os5nfI7XHbBPFt1o0mP9v0hE6X6MxW3o+nvqAmz/WPlQ23RETFG0l9Vna4qFaUFE1n/QhvSVab0XsHP1pUXNn91p99YM/mJHJ/fq/mreCBSlC4abhjZHCtsJbDM6xlyI39b4sWT5dkzqH5/3lozfkeFezSCgXaVEGpgWosT31hVhi0QIkU6qKRQD0lcd6kZiwNZFw81gxGxeVqB21EhbJ190XwIkSIm4yubhJe2yspYsq3KgfVWCFcaxpro4Og==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t9Tze-0004Wt-L5 for guix-patches@gnu.org; Fri, 08 Nov 2024 13:46:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74258] [PATCH 1/3] guix-install.sh: Test if gnu-store.mount exists before removing the unit Resent-From: David Boilleau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Nov 2024 18:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74258 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74258@debbugs.gnu.org Cc: David Boilleau Received: via spool by 74258-submit@debbugs.gnu.org id=B74258.173109150216910 (code B ref 74258); Fri, 08 Nov 2024 18:46:02 +0000 Received: (at 74258) by debbugs.gnu.org; 8 Nov 2024 18:45:02 +0000 Received: from localhost ([127.0.0.1]:52129 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t9Tyc-0004OD-FA for submit@debbugs.gnu.org; Fri, 08 Nov 2024 13:45:01 -0500 Received: from mout.gmx.net ([212.227.17.22]:43721) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t9PhO-0000AG-7y for 74258@debbugs.gnu.org; Fri, 08 Nov 2024 09:10:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.fr; s=s31663417; t=1731075048; x=1731679848; i=david_boilleau@gmx.fr; bh=862NZUM707SZJFoROMhU5edXDBjNqbImESMZv4G0jhM=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-ID:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=VMJEW99viHFKnNtHE9ByWRHq4bAl0nyc1gn7cVYFfV8JDv7RvmMz2CJVXt2shqeD TMQ1wx1vCfdeQ9h3AlY7ndtF8hPmbOlfcizWOxnwaOWB4HccEmgAEkn6hwxh9TzCw WeBAd4Va8NHQuc2fpJvtlUPvCUtX09fX7trWtnqCA5CGWDD7mvXT1pb/rm5rYSrBP skN0kVB0ReFy9h+HxjwUi7lwYJB6ubzFep2Mujz6OdP8Qmx3oTCNWA6xobvMGvGCK S0dP4C95Pn1QySGHYoiuM4I0Flz1z0nMOiLyRWgwLnqUbP6/7DkduiGeSxebcVCG8 QsMsjNPt3sZupVShCQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from pms ([88.126.7.20]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MmULx-1taFzK0grZ-00kNfe; Fri, 08 Nov 2024 15:10:48 +0100 Date: Fri, 8 Nov 2024 15:10:22 +0100 Message-ID: <2a447bdebd8520746ff31f34b87801938e8af17c.1731055803.git.david_boilleau@gmx.fr> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:UFD05tR8ih4acR8lv36Nqoy4xboRQjM4gzFFPyv1YX+Fg52je93 /aBWDwx+ntfByUM9v/AK1Fk+udAmlt2vJVzC+yNatJotJPxYKxF/zsPJYmztt0wdWdygzXR lMRT/GxYXllBRDZJMrvrf0Mt1yoP98uhXhd6j/PgN9grBkjeWpfRPoejYkX3dADS2bI6kvb r5nbj0yb3jyH5qrCgp2tQ== UI-OutboundReport: notjunk:1;M01:P0:7TRMrGxa+wo=;Dber80ml1mqfilmHIZ5GWqHO8VI xougggTTUthofTj7204gUfpRZ0PZenXF+l186hHANmmrehbLVFu8bf0MyuPpWi13C5UApHhm+ wZb7O9PvmzhtnHKYSx9IJEf7Apml6halQXgZMWRnqpg6yBPFAljS52G/OWeufQfmjsw7FaVJe AjTRtbDyo//qkMpjLyRqeSTrjLLFUfKdymrg8k3h4wpLjYuYoebKtYQCtfmQ+/BKD6uuD2TUf jHqsmI/zKFLHRsixLSc9crAzny2l0ZTO10YnnQU3nLJwpN+v9YRvndS2nlN8rKfk3lWzxNsWO Vd7ehV61R7F6GbigEJysWOQeU/7Zbh9u7Ih3oXl2fG9AeQRAIdhdqFcApOOQJ9mR43YrYp+NL DNuIQn1mCzWEPf6NNC8xrz9+tzxnuog+zZkIaFpEt452L+aJcTrNc8VcGDBmSrg4YMxlyJe9R f/7GFeLTyO0lIl3xIkvZn/matJFyYmbQgIQA0T19FU4/5CPk7QzcVzlPgkkFk363dfpqEwaHX LZL/+7RxlnRlYEWMnI3cIiErHSue9J/HZurZ9ByWd0vezH8za4QF0R3l0I2kPuJ4xbga/E+s2 8ph4/K6/uRF+T8zEJ0Ui1OYnFj/u29bYexi2Y/dLvGke26pZ4PrjiQaQu7vyTrczulRjnW0nL 739wW8HEuxH+nJBkXzsN7Tx9ubn5zDTDfgKcV8b7Cnzz9EPwVKNxr2N15loB3SYG/eYskwg4N zAhPGPZe63RQBQOBt0EFL6aj+9autpk4R0X6LK7L0LLxhSpGgxslna50gwhGlrewIiwvE2DKd imCoPvRPeXjtMYKtdCoDcOVor5VQqQVoVp4N3AIW5rf/ZrIB3VebIStC/57XLb4Ywii/UqcG5 8sAdZiVWrWzzNmOvmyTgUXuVyubtabKn28tJz7rMk8Xc+pPBHuQpgKPG0 X-Mailman-Approved-At: Fri, 08 Nov 2024 13:44:56 -0500 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: , Reply-to: David Boilleau X-ACL-Warn: , David Boilleau via Guix-patches X-Patchwork-Original-From: David Boilleau via Guix-patches via From: David Boilleau Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches The file /etc/systemd/system/gnu-store.mount has permissions 664, since the `install_unit()` function installed it so. So the test prior to removing the matching Systemd unit should not be wether this file is executable, otherwise it will always fail. The relevant test is on the file existence. * etc/guix-install.sh (sys_delete_guix_daemon): Test if gnu-store.mount file exists rather than if it is executable. Change-Id: Ic7cc186618b0b92fccf49a3b27805756a9126b89 --- etc/guix-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.43.0 diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 9d9c294d75..e97190d964 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -576,7 +576,7 @@ sys_delete_guix_daemon() _msg "${INF}removing guix-daemon" rm -f /etc/systemd/system/guix-daemon.service - if [ -x /etc/systemd/system/gnu-store.mount ]; then + if [ -f /etc/systemd/system/gnu-store.mount ]; then _msg "${INF}disabling gnu-store.mount" systemctl disable gnu-store.mount _msg "${INF}stopping gnu-store.mount"