* [bug#71402] [PATCH] services: Never throw when stopping mount-may-fail file systems.
@ 2024-06-06 21:27 Ludovic Courtès
2024-06-26 22:22 ` bug#71402: " Ludovic Courtès
0 siblings, 1 reply; 2+ messages in thread
From: Ludovic Courtès @ 2024-06-06 21:27 UTC (permalink / raw)
To: 71402; +Cc: Ludovic Courtès
This is a followup to 7c27bd115b14afd142da7684cc349369965f9eab.
* gnu/services/base.scm (file-system-shepherd-service): Catch
'system-error from ‘umount’ call when FILE-SYSTEM is marked as
mount-may-fail.
Change-Id: I2234f8da320b43089f4ee058cad8608ce9c078f8
---
gnu/services/base.scm | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
Hi!
File systems marked as mount-may-fail could throw when stopped
(when the file system hadn't actually been mount). This was mostly
harmless, but it should be ignored as well.
Thoughts?
Ludo'.
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 2d6b0f00e02..c7a14c7ed43 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -448,7 +448,11 @@ (define (file-system-shepherd-service file-system)
;; Make sure PID 1 doesn't keep TARGET busy.
(chdir "/")
- (umount #$target)
+ #$(if (file-system-mount-may-fail? file-system)
+ #~(catch 'system-error
+ (lambda () (umount #$target))
+ (const #f))
+ #~(umount #$target))
#f))
;; We need additional modules.
base-commit: 40c6f708393885a2d28f847350e8f47beb11e745
--
2.45.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#71402: [PATCH] services: Never throw when stopping mount-may-fail file systems.
2024-06-06 21:27 [bug#71402] [PATCH] services: Never throw when stopping mount-may-fail file systems Ludovic Courtès
@ 2024-06-26 22:22 ` Ludovic Courtès
0 siblings, 0 replies; 2+ messages in thread
From: Ludovic Courtès @ 2024-06-26 22:22 UTC (permalink / raw)
To: 71402-done
Ludovic Courtès <ludo@gnu.org> skribis:
> This is a followup to 7c27bd115b14afd142da7684cc349369965f9eab.
>
> * gnu/services/base.scm (file-system-shepherd-service): Catch
> 'system-error from ‘umount’ call when FILE-SYSTEM is marked as
> mount-may-fail.
>
> Change-Id: I2234f8da320b43089f4ee058cad8608ce9c078f8
I went ahead and pushed this as
7c8d38f91e7bd4aed106aacc78eb454789538c31.
Ludo’.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-06-26 22:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-06 21:27 [bug#71402] [PATCH] services: Never throw when stopping mount-may-fail file systems Ludovic Courtès
2024-06-26 22:22 ` bug#71402: " Ludovic Courtès
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).