diff options
| author | David Thompson <dthompson2@worcester.edu> | 2015-07-07 21:58:15 -0400 |
|---|---|---|
| committer | David Thompson <dthompson2@worcester.edu> | 2015-07-09 08:23:03 -0400 |
| commit | 85c3127fa9226ff9efa504dddffcf8442f54488d (patch) | |
| tree | 65d870e74969c9caa56de7b67c71379b6dcaa360 | |
| parent | 9f04196d88a9b50ea65a6eb05dc0372e985bca41 (diff) | |
| download | gnu-guix-85c3127fa9226ff9efa504dddffcf8442f54488d.tar gnu-guix-85c3127fa9226ff9efa504dddffcf8442f54488d.tar.gz | |
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.
| -rw-r--r-- | gnu/build/file-systems.scm | 7 | ||||
| -rw-r--r-- | 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 72c8bd59f3..04431ba596 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 d63804a06c..efad14596a 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) |