guix-commits
[Top][All Lists]
Advanced

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

branch master updated: installer: Fix cow-store umount issue.


From: guix-commits
Subject: branch master updated: installer: Fix cow-store umount issue.
Date: Mon, 23 Mar 2020 13:47:34 -0400

This is an automated email from the git hooks/post-receive script.

mothacehe pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new f9b6f75  installer: Fix cow-store umount issue.
f9b6f75 is described below

commit f9b6f75d1c387acbedfb27962d5dbd34bc3c1492
Author: Mathieu Othacehe <address@hidden>
AuthorDate: Mon Mar 23 18:35:51 2020 +0100

    installer: Fix cow-store umount issue.
    
    * gnu/installer/final.scm (kill-cow-users): Ignore exception that could be
    raised if a process disappears between reading its pid and its maps file.
---
 gnu/installer/final.scm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/gnu/installer/final.scm b/gnu/installer/final.scm
index 3c170e5..4c2da48 100644
--- a/gnu/installer/final.scm
+++ b/gnu/installer/final.scm
@@ -111,12 +111,13 @@ USERS."
 
   (let ((pids
          (filter-map (lambda (pid)
-                       (call-with-input-file
-                           (string-append "/proc/" pid "/maps")
-                         (lambda (port)
-                           (and (string-contains (get-string-all port)
-                                                 cow-path)
-                                (string->number pid)))))
+                       (false-if-exception
+                        (call-with-input-file
+                            (string-append "/proc/" pid "/maps")
+                          (lambda (port)
+                            (and (string-contains (get-string-all port)
+                                                  cow-path)
+                                 (string->number pid))))))
                      (scandir "/proc" string->number))))
     (for-each (lambda (pid)
                 ;; cmdline does not always exist.



reply via email to

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