02/03: file-systems: Allow for bind-mounts of named sockets.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit bb5cad4eb2473889dd9938ab3d0453d30b0765e7
Author: Ludovic Courtès <address@hidden>
Date:   Wed Apr 12 16:26:00 2017 +0200

    file-systems: Allow for bind-mounts of named sockets.
    
    Previously a named socket such as /dev/log would fail
    the 'regular-file?' test and we'd end up mkdir'ing it.
    
    * gnu/build/file-systems.scm (regular-file?): Remove.
    (mount-file-system): Change (regular-file? source)
    to (not (file-is-directory? source)).
---
 gnu/build/file-systems.scm | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm
index eb9f078..0cb84b8 100644
--- a/gnu/build/file-systems.scm
+++ b/gnu/build/file-systems.scm
@@ -565,10 +565,6 @@ corresponds to the symbols listed in FLAGS."
       (()
        0))))
 
-(define (regular-file? file-name)
-  "Return #t if FILE-NAME is a regular file."
-  (eq? (stat:type (stat file-name)) 'regular))
-
 (define* (mount-file-system spec #:key (root "/root"))
   "Mount the file system described by SPEC under ROOT.  SPEC must have the
 form:
@@ -608,9 +604,9 @@ run a file system check."
          (check-file-system source type))
 
        ;; 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.
+       ;; in the case of a bind mount, a regular file or socket may be needed.
        (if (and (= MS_BIND (logand flags MS_BIND))
-                (regular-file? source))
+                (not (file-is-directory? source)))
            (unless (file-exists? mount-point)
              (mkdir-p (dirname mount-point))
              (call-with-output-file mount-point (const #t)))