unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: David Boilleau via Guix-patches via <guix-patches@gnu.org>
To: 74258@debbugs.gnu.org
Cc: David Boilleau <david_boilleau@gmx.fr>
Subject: [bug#74258] [PATCH 1/3] guix-install.sh: Test if gnu-store.mount exists before removing the unit
Date: Fri,  8 Nov 2024 15:10:22 +0100	[thread overview]
Message-ID: <2a447bdebd8520746ff31f34b87801938e8af17c.1731055803.git.david_boilleau@gmx.fr> (raw)
In-Reply-To: <cover.1731055803.git.david_boilleau@gmx.fr>

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(-)

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"
--
2.43.0





  reply	other threads:[~2024-11-08 18:46 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-08 13:41 [bug#74258] [PATCH 0/3] Fix uninstall script David Boilleau via Guix-patches via
2024-11-08 14:10 ` David Boilleau via Guix-patches via [this message]
2024-11-08 14:10 ` [bug#74258] [PATCH 2/3] guix-install.sh: Replace `ROOT_HOME` with `~root` David Boilleau via Guix-patches via
2024-11-08 14:10 ` [bug#74258] [PATCH 3/3] guix-install.sh: Run the uninstall even if already partially done David Boilleau via Guix-patches via
2024-11-14 14:41 ` bug#74258: [PATCH 0/3] Fix uninstall script Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=2a447bdebd8520746ff31f34b87801938e8af17c.1731055803.git.david_boilleau@gmx.fr \
    --to=guix-patches@gnu.org \
    --cc=74258@debbugs.gnu.org \
    --cc=david_boilleau@gmx.fr \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).