[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
56/80: installer: Replace spawned mount command with the mount syscall.
From: |
John Darrington |
Subject: |
56/80: installer: Replace spawned mount command with the mount syscall. |
Date: |
Tue, 3 Jan 2017 15:49:45 +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))
- 55/80: installer: Close unused ports in pipe-cmd., (continued)
- 55/80: installer: Close unused ports in pipe-cmd., John Darrington, 2017/01/03
- 72/80: installer: Ensure that all mount points are absolute paths., John Darrington, 2017/01/03
- 70/80: installer: Change essid --> wireless., John Darrington, 2017/01/03
- 52/80: installer: Fix bug where window-pipe did not return the proper exit status., John Darrington, 2017/01/03
- 78/80: installer: Rename "file-browser" -> "time-zone"., John Darrington, 2017/01/03
- 75/80: installer: Add predicate for the network task., John Darrington, 2017/01/03
- 50/80: installer: Rename module "new" to "guixsd-installer"., John Darrington, 2017/01/03
- 54/80: installer: Improve install page., John Darrington, 2017/01/03
- 62/80: installer: Use global variable instead of string literal for "/gnu"., John Darrington, 2017/01/03
- 63/80: installer: Do not use /tmp for holding the configuration., John Darrington, 2017/01/03
- 56/80: installer: Replace spawned mount command with the mount syscall.,
John Darrington <=
- 53/80: installer: Replace "%temporary-configuration-file-port" with "config-file"., John Darrington, 2017/01/03
- 51/80: installer: Use consistent window heights., John Darrington, 2017/01/03
- 15/80: installer: Add procedures to replace car/cdr since these are frounded upon by Guile gurus., John Darrington, 2017/01/03
- 65/80: installer: Add flags to indicate network interface status., John Darrington, 2017/01/03
- 66/80: installer: Format configuration to fix width of window., John Darrington, 2017/01/03
- 80/80: installer: Use --fallback when installing., John Darrington, 2017/01/03
- 69/80: installer: Add page with which the wifi password can be entered., John Darrington, 2017/01/03
- 60/80: installer: Change N_ from a procedure to a macro., John Darrington, 2017/01/03
- 67/80: installer: Do not allow forms to set the cursor visibility., John Darrington, 2017/01/03
- 74/80: installer: Add option to final page to reboot the system., John Darrington, 2017/01/03