[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
13/21: installer: Replace spawned mount command with the mount syscall.
From: |
John Darrington |
Subject: |
13/21: installer: Replace spawned mount command with the mount syscall. |
Date: |
Sat, 31 Dec 2016 14:54:18 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit 82630e42fe9fc2aca09e4c4c5759970f7aea532e
Author: John Darrington <address@hidden>
Date: Fri Dec 30 09:35:48 2016 +0100
installer: Replace spawned mount command with the mount syscall.
* gnu/system/installer/install.scm (install-page-key-handler): Use the mount
system call, instead of spawning the mount command.
---
gnu/system/installer/install.scm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/gnu/system/installer/install.scm b/gnu/system/installer/install.scm
index ceeb960..65e7520 100644
--- a/gnu/system/installer/install.scm
+++ b/gnu/system/installer/install.scm
@@ -27,6 +27,7 @@
#:use-module (ncurses curses)
#:use-module (guix store)
#:use-module (guix utils)
+ #:use-module ((guix build syscalls) #:select (mount umount))
#:use-module (guix build utils)
#:export (make-install-page))
@@ -37,7 +38,6 @@
title
install-page-refresh
install-page-key-handler)))
-
page))
@@ -82,11 +82,10 @@
(lambda ()
(and
(mkdir-p target)
- (zero? (pipe-cmd window-port "mount"
- "mount" "-t" "ext4" root-device target))
+ (mount root-device target "ext4" #:update-mtab? #f)
(zero? (pipe-cmd window-port "herd"
- "herd" "start" "cow-store" target))
+ "herd" "start" "cow-store" target))
(mkdir-p (string-append target "/etc"))
(or (copy-file config-file
@@ -107,8 +106,9 @@
(lambda (key subr message args . rest)
(display-error (stack-ref (make-stack #t) 3)
window-port subr message args rest)))
+
(close-port window-port))))
- #f))
+ #f))
(define (install-page-refresh page)
(when (not (page-initialised? page))
- 06/21: installer: Wrap installer in (catch #t ...), (continued)
- 06/21: installer: Wrap installer in (catch #t ...), John Darrington, 2016/12/31
- 16/21: installer: Prevent the user specifying the same mount point twice., John Darrington, 2016/12/31
- 04/21: installer: Turn off kernel ring messages to console., John Darrington, 2016/12/31
- 01/21: installer: Add wireless-tools bin directory to PATH., John Darrington, 2016/12/31
- 02/21: installer: Replace an instance of cdr with match., John Darrington, 2016/12/31
- 12/21: installer: Close unused ports in pipe-cmd., John Darrington, 2016/12/31
- 08/21: installer: Use consistent window heights., John Darrington, 2016/12/31
- 20/21: installer: Do not use /tmp for holding the configuration., John Darrington, 2016/12/31
- 14/21: installer: Issue message to user on failure of filesystems task., John Darrington, 2016/12/31
- 07/21: installer: Rename module "new" to "guixsd-installer"., John Darrington, 2016/12/31
- 13/21: installer: Replace spawned mount command with the mount syscall.,
John Darrington <=
- 11/21: installer: Improve install page., John Darrington, 2016/12/31
- 10/21: installer: Replace "%temporary-configuration-file-port" with "config-file"., John Darrington, 2016/12/31
- 19/21: installer: Use global variable instead of string literal for "/gnu"., John Darrington, 2016/12/31
- 17/21: installer: Change N_ from a procedure to a macro., John Darrington, 2016/12/31
- 18/21: installer: Change the order of the filesystem task conditions., John Darrington, 2016/12/31
- 15/21: installer: Allow users to remove mount points during configuration., John Darrington, 2016/12/31
- 21/21: installer: Add a console-keymap service., John Darrington, 2016/12/31
- 09/21: installer: Fix bug where window-pipe did not return the proper exit status., John Darrington, 2016/12/31