02/02: file-systems: Do not truncate mount points that already exist.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 78981bb9bd66ba65af133fda6474664c330f30c4
Author: Ludovic Courtès <address@hidden>
Date:   Sat Oct 17 11:57:38 2015 +0200

    file-systems: Do not truncate mount points that already exist.
    
    Reported by David Thompson <address@hidden>
    at <https://lists.gnu.org/archive/html/guix-devel/2015-10/msg00284.html>.
    
    * gnu/build/file-systems.scm (mount-file-system): When SOURCE matches
      'regular-file?', do not create MOUNT-POINT if it already exists.  This
      fixes a bug whereby we would be truncating MOUNT-POINT if it already
      existed.
---
 gnu/build/file-systems.scm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm
index 377bec2..00af35d 100644
--- a/gnu/build/file-systems.scm
+++ b/gnu/build/file-systems.scm
@@ -348,7 +348,7 @@ run a file system check."
        ;; in the case of a bind mount, a regular file may be needed.
        (if (and (= MS_BIND (logand flags MS_BIND))
                 (regular-file? source))
-           (begin
+           (unless (file-exists? mount-point)
              (mkdir-p (dirname mount-point))
              (call-with-output-file mount-point (const #t)))
            (mkdir-p mount-point))