diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-06-07 11:54:03 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-06-07 11:54:03 +0200 |
| commit | aeafff536f933b07836b14d089dfc52b0e432ec9 (patch) | |
| tree | 4ede554999f98cf9e19c04098c934db52efae795 /gnu/system | |
| parent | 9dee9e8ffe4650949bd3ad2edf559cf4a33e9e6e (diff) | |
| parent | f82c58539e1f7b9b864e68ea2ab0c6a17c15fbb5 (diff) | |
| download | guix-aeafff536f933b07836b14d089dfc52b0e432ec9.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/file-systems.scm | 1 | ||||
| -rw-r--r-- | gnu/system/install.scm | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm index 7e8c4489dd..f4cfaf0990 100644 --- a/gnu/system/file-systems.scm +++ b/gnu/system/file-systems.scm @@ -18,7 +18,6 @@ (define-module (gnu system file-systems) #:use-module (ice-9 match) - #:use-module (guix gexp) #:use-module (guix records) #:use-module (guix store) #:use-module ((gnu build file-systems) diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 07ad3cbcb2..a72613e9c5 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -145,6 +145,11 @@ current store is on a RAM disk." (chmod #$directory #o1775))) #~(begin + ;; Bind-mount TARGET's /tmp in case we need space to build things. + (let ((tmpdir (string-append #$target "/tmp"))) + (mkdir-p tmpdir) + (mount tmpdir "/tmp" "none" MS_BIND)) + (unless (file-exists? "/.ro-store") (mkdir "/.ro-store") (mount #$(%store-prefix) "/.ro-store" "none" |