01/03: file-systems: Always write the options field in /etc/mtab.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 1c27641f46ce6a02552fda59281727a38d7fe105
Author: Ludovic Courtès <address@hidden>
Date:   Thu Nov 20 20:54:46 2014 +0100

    file-systems: Always write the options field in /etc/mtab.
    
    * gnu/build/file-systems.scm (mount-file-system): When OPTIONS is false,
      write "rw" to /etc/mtab.  This fixes a bug whereby 'remove-from-mtab'
      in (guix syscalls) would otherwise raise a 'match-error' because of
      the missing field.  This affected file systems mounted from the
      initrd, such as devtmpfs, which has options == #f.
---
 gnu/build/file-systems.scm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm
index 4ac7a7f..84f5853 100644
--- a/gnu/build/file-systems.scm
+++ b/gnu/build/file-systems.scm
@@ -293,7 +293,7 @@ run a file system check."
        (mkdir-p (string-append root "/etc"))
        (let ((port (open-file (string-append root "/etc/mtab") "a")))
          (format port "~a ~a ~a ~a 0 0~%"
-                 source mount-point type (or options ""))
+                 source mount-point type (or options "rw"))
          (close-port port))))))
 
 ;;; file-systems.scm ends here