From: Mathieu Othacehe <m.othacehe@gmail.com>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: 26341@debbugs.gnu.org
Subject: bug#26341: [PATCH] build: vm: Add missing module.
Date: Wed, 05 Apr 2017 12:32:30 +0200 [thread overview]
Message-ID: <86a87vrvpd.fsf@gmail.com> (raw)
In-Reply-To: <86bmsbrvsk.fsf@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 38 bytes --]
The attached patch ...
Sorry
Mathie
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: mount.patch --]
[-- Type: text/x-diff, Size: 4426 bytes --]
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."
- (let-values (((ret err)
- (proc (if source
- (string->pointer source)
- %null-pointer)
- (string->pointer target)
- (if type
- (string->pointer type)
- %null-pointer)
- flags
- (if options
- (string->pointer options)
- %null-pointer))))
- (unless (zero? ret)
- (throw 'system-error "mount" "mount ~S on ~S: ~A"
- (list source target (strerror err))
- (list err)))
- (when update-mtab?
- (augment-mtab source target type options))))))
+ (let-values (((ret err)
+ (proc (if source
+ (string->pointer source)
+ %null-pointer)
+ (string->pointer target)
+ (if type
+ (string->pointer type)
+ %null-pointer)
+ flags
+ (if options
+ (string->pointer options)
+ %null-pointer))))
+ (unless (zero? ret)
+ (throw 'system-error "mount" "mount ~S on ~S: ~A"
+ (list source target (strerror err))
+ (list err)))
+ (when update-mtab?
+ (augment-mtab source target type options)))))))
(define umount
- (let ((proc (if (module-defined? the-scm-module 'umount)
- (module-ref the-scm-module 'umount)
- (syscall->procedure int "umount2" `(* ,int)))))
- (lambda* (target #:optional (flags 0)
- #:key (update-mtab? #f))
- "Unmount TARGET. Optionally FLAGS may be one of the MNT_* or UMOUNT_*
+ (if (module-defined? the-scm-module 'umount)
+ (module-ref the-scm-module 'umount)
+ (let ((proc (syscall->procedure int "umount2" `(* ,int))))
+ (lambda* (target #:optional (flags 0)
+ #:key (update-mtab? #f))
+ "Unmount TARGET. Optionally FLAGS may be one of the MNT_* or UMOUNT_*
constants from <sys/mount.h>."
- (let-values (((ret err)
- (proc (string->pointer target) flags)))
- (unless (zero? ret)
- (throw 'system-error "umount" "~S: ~A"
- (list target (strerror err))
- (list err)))
- (when update-mtab?
- (remove-from-mtab target))))))
+ (let-values (((ret err)
+ (proc (string->pointer target) flags)))
+ (unless (zero? ret)
+ (throw 'system-error "umount" "~S: ~A"
+ (list target (strerror err))
+ (list err)))
+ (when update-mtab?
+ (remove-from-mtab target)))))))
(define (mount-points)
"Return the mounts points for currently mounted file systems."
[-- Attachment #3: Type: text/plain, Size: 2 bytes --]
u
next prev parent reply other threads:[~2017-04-05 10:33 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-02 15:01 bug#26341: [PATCH] build: vm: Add missing module Mathieu Othacehe
2017-04-04 12:41 ` Ludovic Courtès
2017-04-05 10:30 ` Mathieu Othacehe
2017-04-05 10:32 ` Mathieu Othacehe [this message]
2017-04-05 21:39 ` Ludovic Courtès
2017-04-06 6:55 ` Mathieu Othacehe
2017-04-06 8:10 ` Ludovic Courtès
2017-04-07 21:36 ` Ludovic Courtès
2017-04-08 9:24 ` Mathieu Othacehe
2017-04-05 21:35 ` Ludovic Courtès
2017-04-06 6:55 ` bug#26341: [PATCH 1/2] build: syscalls: Allow mount and umount use from static Guile Mathieu Othacehe
2017-04-06 6:55 ` bug#26341: [PATCH 2/2] build: vm: Add missing module Mathieu Othacehe
2017-04-08 16:03 ` bug#26341: [PATCH 0/5] Fix warnings related to syscalls in static Guile Mathieu Othacehe
2017-04-08 16:03 ` bug#26341: [PATCH 1/5] build: syscalls: Add reboot Mathieu Othacehe
2017-04-10 9:42 ` Ludovic Courtès
2017-04-10 13:18 ` Mathieu Othacehe
2017-04-10 13:41 ` Ludovic Courtès
2017-04-10 17:18 ` Mathieu Othacehe
2017-04-08 16:03 ` bug#26341: [PATCH 2/5] build: syscalls: Allow use to network-interface syscalls independently of calling context Mathieu Othacehe
2017-04-08 16:03 ` bug#26341: [PATCH 3/5] build: syscalls: Add mount and umount to #:replace list Mathieu Othacehe
2017-04-08 16:03 ` bug#26341: [PATCH 4/5] build: syscalls: Add load-linux-module Mathieu Othacehe
2017-04-08 16:03 ` bug#26341: [PATCH 5/5] build: Fix compilation warnings Mathieu Othacehe
2017-04-10 17:18 ` bug#26341: [PATCH 1/5] build: syscalls: Add reboot Mathieu Othacehe
2017-04-10 17:18 ` bug#26341: [PATCH 2/5] build: syscalls: Use define-as-needed for mount and umount Mathieu Othacehe
2017-04-10 17:18 ` bug#26341: [PATCH 3/5] build: syscalls: Use define-as-needed for network-interface syscalls Mathieu Othacehe
2017-04-10 17:18 ` bug#26341: [PATCH 4/5] build: syscalls: Add load-linux-module Mathieu Othacehe
2017-04-10 17:18 ` bug#26341: [PATCH 5/5] build: Fix compilation warnings Mathieu Othacehe
2017-04-11 9:15 ` bug#26341: [PATCH 1/5] build: syscalls: Add reboot Ludovic Courtès
2017-04-11 11:39 ` Mathieu Othacehe
2017-04-11 12:20 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=86a87vrvpd.fsf@gmail.com \
--to=m.othacehe@gmail.com \
--cc=26341@debbugs.gnu.org \
--cc=ludo@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).