01/03: build: file-systems: Import (guix build syscalls) for non-static Guiles.

[David Thompson]

davexunit pushed a commit to branch master
in repository guix.

commit 85c3127fa9226ff9efa504dddffcf8442f54488d
Author: David Thompson <address@hidden>
Date:   Tue Jul 7 21:58:15 2015 -0400

    build: file-systems: Import (guix build syscalls) for non-static Guiles.
    
    * gnu/build/file-systems.scm: Import (guix build syscalls) when 'mount' is 
not
      defined.
    * gnu/system.scm (operating-system-activation-script): Include (guix build
      syscalls) module in derivation.
---
 gnu/build/file-systems.scm |    7 +++++++
 gnu/system.scm             |    1 +
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm
index 72c8bd5..04431ba 100644
--- a/gnu/build/file-systems.scm
+++ b/gnu/build/file-systems.scm
@@ -50,6 +50,13 @@
 ;;;
 ;;; Code:
 
+;; 'mount' is already defined in the statically linked Guile used for initial
+;; RAM disks, but in all other cases the (guix build syscalls) module contains
+;; the mount binding.
+(unless (defined? 'mount)
+  (module-use! (current-module)
+               (resolve-interface '(guix build syscalls))))
+
 ;; Linux mount flags, from libc's <sys/mount.h>.
 (define MS_RDONLY 1)
 (define MS_NOSUID 2)
diff --git a/gnu/system.scm b/gnu/system.scm
index d63804a..efad145 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -689,6 +689,7 @@ etc."
       (gnu build linux-modules)
       (gnu build file-systems)
       (guix build utils)
+      (guix build syscalls)
       (guix elf)))
 
   (define (service-activations services)