diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-06-21 14:30:22 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-06-21 14:30:22 -0400 |
| commit | bf76d98789a0fc6303c303beddbc1ed609f2a6ea (patch) | |
| tree | 1df8db2fa06f6826a1c7a1cb1faa253df704834e /gnu/build/file-systems.scm | |
| parent | fc9ff915b3cfcb494dbb5c8ab767972352fa31da (diff) | |
| parent | 12b04cbee6b9c725db8a5c898b597de8e667bef0 (diff) | |
| download | guix-bf76d98789a0fc6303c303beddbc1ed609f2a6ea.tar.gz guix-bf76d98789a0fc6303c303beddbc1ed609f2a6ea.zip | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/build/file-systems.scm')
| -rw-r--r-- | gnu/build/file-systems.scm | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm index dc99d60d3d..72c8bd59f3 100644 --- a/gnu/build/file-systems.scm +++ b/gnu/build/file-systems.scm @@ -286,16 +286,13 @@ run a file system check." (when check? (check-file-system source type)) (mkdir-p mount-point) - (mount source mount-point type flags - (if options - (string->pointer options) - %null-pointer)) + (mount source mount-point type flags options) ;; For read-only bind mounts, an extra remount is needed, as per ;; <http://lwn.net/Articles/281157/>, which still applies to Linux 4.0. (when (and (= MS_BIND (logand flags MS_BIND)) (= MS_RDONLY (logand flags MS_RDONLY))) - (mount source mount-point type (logior MS_BIND MS_REMOUNT MS_RDONLY) - %null-pointer)))))) + (let ((flags (logior MS_BIND MS_REMOUNT MS_RDONLY))) + (mount source mount-point type flags #f))))))) ;;; file-systems.scm ends here |