diff mbox

gnu: file-system-shepherd-service: Use mount-file-system.

Message ID 1480444419-32288-1-git-send-email-jmd@gnu.org
State New
Headers show

Commit Message

John Darrington Nov. 29, 2016, 6:33 p.m. UTC
* gnu/services/base.scm (file-system-shepherd-service): Use mount-file-system
instead of manually mounting the file system.
---
 gnu/services/base.scm | 38 +++++++++-----------------------------
 1 file changed, 9 insertions(+), 29 deletions(-)

Comments

Ludovic Courtès Nov. 30, 2016, 12:51 p.m. UTC | #1
John Darrington <jmd@gnu.org> skribis:

> * gnu/services/base.scm (file-system-shepherd-service): Use mount-file-system
> instead of manually mounting the file system.

[...]

> +		       #$(if create?
> +			     #~(mkdir-p #$target)
> +			     #~#t)

#~#t is equivalent to #t.

> +		       (mount-file-system
> +			`(#$device #$title #$target #$type #$flags #$options
> +				   #$check?) #:root "/")
>                         #t))

#t must be align with the parent of “(mount-file-system”.

If you confirmed that at least “make check-system TESTS=basic” passes,
fine with me.

Thank you!

Ludo’.
John Darrington Dec. 2, 2016, 11:32 a.m. UTC | #2
On Wed, Nov 30, 2016 at 01:51:23PM +0100, Ludovic Court??s wrote:
     John Darrington <jmd@gnu.org> skribis:
     
     > * gnu/services/base.scm (file-system-shepherd-service): Use mount-file-system
     > instead of manually mounting the file system.
     
     [...]
     
     > +		       #$(if create?
     > +			     #~(mkdir-p #$target)
     > +			     #~#t)
     
     #~#t is equivalent to #t.
     
     > +		       (mount-file-system
     > +			`(#$device #$title #$target #$type #$flags #$options
     > +				   #$check?) #:root "/")
     >                         #t))
     
     #t must be align with the parent of ???(mount-file-system???.
     
     If you confirmed that at least ???make check-system TESTS=basic??? passes,
     fine with me.
     

Perhaps somebody who already has a copy of qemu in their store could check that
for me?

Currently I cannot run any system tests because of bug #25036

J'
David Craven Dec. 2, 2016, 4:44 p.m. UTC | #3
> Perhaps somebody who already has a copy of qemu in their store could check that
> for me?

I tested it and pushed...
Ludovic Courtès Dec. 4, 2016, 9:12 p.m. UTC | #4
John Darrington <john@darrington.wattle.id.au> skribis:

> On Wed, Nov 30, 2016 at 01:51:23PM +0100, Ludovic Court??s wrote:
>      John Darrington <jmd@gnu.org> skribis:
>      
>      > * gnu/services/base.scm (file-system-shepherd-service): Use mount-file-system
>      > instead of manually mounting the file system.
>      
>      [...]
>      
>      > +		       #$(if create?
>      > +			     #~(mkdir-p #$target)
>      > +			     #~#t)
>      
>      #~#t is equivalent to #t.
>      
>      > +		       (mount-file-system
>      > +			`(#$device #$title #$target #$type #$flags #$options
>      > +				   #$check?) #:root "/")
>      >                         #t))
>      
>      #t must be align with the parent of ???(mount-file-system???.
>      
>      If you confirmed that at least ???make check-system TESTS=basic??? passes,
>      fine with me.
>      
>
> Perhaps somebody who already has a copy of qemu in their store could check that
> for me?

hydra.gnu.org has a copy.  :-)

Anyway, thanks for pushing this!

Ludo’.
diff mbox

Patch

diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index afbecdb..d909693 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -252,6 +252,8 @@  FILE-SYSTEM."
         (device  (file-system-device file-system))
         (type    (file-system-type file-system))
         (title   (file-system-title file-system))
+        (flags   (file-system-flags file-system))
+        (options (file-system-options file-system))
         (check?  (file-system-check? file-system))
         (create? (file-system-create-mount-point? file-system))
         (dependencies (file-system-dependencies file-system)))
@@ -264,34 +266,12 @@  FILE-SYSTEM."
                            ,@(map dependency->shepherd-service-name dependencies)))
             (documentation "Check, mount, and unmount the given file system.")
             (start #~(lambda args
-                       ;; FIXME: Use or factorize with 'mount-file-system'.
-                       (let ((device (canonicalize-device-spec #$device '#$title))
-                             (flags  #$(mount-flags->bit-mask
-                                        (file-system-flags file-system))))
-                         #$(if create?
-                               #~(mkdir-p #$target)
-                               #~#t)
-                         #$(if check?
-                               #~(begin
-                                   ;; Make sure fsck.ext2 & co. can be found.
-                                   (setenv "PATH"
-                                           (string-append
-                                            #$e2fsprogs "/sbin:"
-                                            "/run/current-system/profile/sbin:"
-                                            (getenv "PATH")))
-                                   (check-file-system device #$type))
-                               #~#t)
-
-                         (mount device #$target #$type flags
-                                #$(file-system-options file-system))
-
-                         ;; 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 device #$target #$type
-                                  (logior MS_BIND MS_REMOUNT MS_RDONLY))))
+		       #$(if create?
+			     #~(mkdir-p #$target)
+			     #~#t)
+		       (mount-file-system
+			`(#$device #$title #$target #$type #$flags #$options
+				   #$check?) #:root "/")
                        #t))
             (stop #~(lambda args
                       ;; Normally there are no processes left at this point, so
@@ -305,7 +285,7 @@  FILE-SYSTEM."
 
             ;; We need an additional module.
             (modules `(((gnu build file-systems)
-                        #:select (check-file-system canonicalize-device-spec))
+                        #:select (mount-file-system))
                        ,@%default-modules)))))))
 
 (define file-system-service-type