[PATCH] build: Do not clobber existing files when bind mounting.

[PATCH] build: Do not clobber existing files when bind mounting.

[Thompson, David]

[-- Attachment #1: Type: text/plain, Size: 140 bytes --]

This really bit me while trying to wrap up the tests for 'guix
environment --container'.  Thanks to Ludovic for tracking this down!

- Dave

[-- Attachment #2: 0001-build-Do-not-clobber-existing-files-when-bind-mounti.patch --]
[-- Type: text/x-diff, Size: 1103 bytes --]

From 482a31152260f48d1e96ffe74a2b1a9898d5f09c Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Fri, 16 Oct 2015 14:00:00 -0400
Subject: [PATCH] build: Do not clobber existing files when bind mounting.

* gnu/build/file-systems.scm (mount-file-system): Do not touch
  'mount-point' if it already exists.
---
 gnu/build/file-systems.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm
index 377bec2..df6d3da 100644
--- a/gnu/build/file-systems.scm
+++ b/gnu/build/file-systems.scm
@@ -347,7 +347,8 @@ run a file system check."
        ;; Create the mount point.  Most of the time this is a directory, but
        ;; in the case of a bind mount, a regular file may be needed.
        (if (and (= MS_BIND (logand flags MS_BIND))
-                (regular-file? source))
+                (regular-file? source)
+                (not (file-exists? mount-point)))
            (begin
              (mkdir-p (dirname mount-point))
              (call-with-output-file mount-point (const #t)))
-- 
2.5.0

Re: [PATCH] build: Do not clobber existing files when bind mounting.

[Ludovic Courtès]

"Thompson, David" <dthompson2@worcester.edu> skribis:

> From 482a31152260f48d1e96ffe74a2b1a9898d5f09c Mon Sep 17 00:00:00 2001
> From: David Thompson <dthompson2@worcester.edu>
> Date: Fri, 16 Oct 2015 14:00:00 -0400
> Subject: [PATCH] build: Do not clobber existing files when bind mounting.
>
> * gnu/build/file-systems.scm (mount-file-system): Do not touch
>   'mount-point' if it already exists.

Oops, I ended up pushing a similar thing this morning as 78981bb, due to
my mail-checking asynchronicity!  Let me know if it’s OK.

Thanks,
Ludo’.