guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#74258] [PATCH 1/3] guix-install.sh: Test if gnu-store.mount exists


From: David Boilleau
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

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 via email to

[Prev in Thread] Current Thread [Next in Thread]