Subject: Re: bug#26341: [PATCH] build: vm: Add missing module.

From: [email-masked] (Ludovic Courtès)
Date: Wed, 05 Apr 2017 23:39:06 +0200

Mathieu Othacehe <[email-masked]> skribis:

> diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm
> index 3fa318df3..2de664aa7 100644
> --- a/guix/build/syscalls.scm
> +++ b/guix/build/syscalls.scm
> @@ -462,51 +462,51 @@ the returned procedure is called."
>  (define UMOUNT_NOFOLLOW 8)
>  
>  (define mount
> -  (let ((proc (if (module-defined? the-scm-module 'mount)
> -                  (module-ref the-scm-module 'mount)
> -                  (syscall->procedure int "mount" `(* * * ,unsigned-long *)))))
> -    (lambda* (source target type #:optional (flags 0) options
> -                     #:key (update-mtab? #f))
> -      "Mount device SOURCE on TARGET as a file system TYPE.  Optionally, FLAGS
> +  (if (module-defined? the-scm-module 'mount)
> +      (module-ref the-scm-module 'mount)
> +      (let ((proc (syscall->procedure int "mount" `(* * * ,unsigned-long *))))
> +        (lambda* (source target type #:optional (flags 0) options
> +                         #:key (update-mtab? #f))
> +          "Mount device SOURCE on TARGET as a file system TYPE.  Optionally, FLAGS
>  may be a bitwise-or of the MS_* <sys/mount.h> constants, and OPTIONS may be a
>  string.  When FLAGS contains MS_REMOUNT, SOURCE and TYPE are ignored.  When
>  UPDATE-MTAB? is true, update /etc/mtab.  Raise a 'system-error' exception on
>  error."

That introduces a slight difference: in one case #:update-mtab? is not
honored.  That said, it’s probably OK to ignore it; maybe leave an “XXX”
comment above just in case.  ;-)

Otherwise LGTM.

Can you send a ‘git format-patch’ thing?  (Otherwise I could write the
commit log on your behalf.)

Thanks!

Ludo’.