[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
62/80: installer: Use global variable instead of string literal for "/gn
From: |
John Darrington |
Subject: |
62/80: installer: Use global variable instead of string literal for "/gnu". |
Date: |
Tue, 3 Jan 2017 15:49:45 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit 88bda066b96918aa74b3bd4926a7801f012a5c49
Author: John Darrington <address@hidden>
Date: Sat Dec 31 10:11:48 2016 +0100
installer: Use global variable instead of string literal for "/gnu".
* gnu/system/installer/filesystems.scm: Replace "/gnu" with
(%store-directory).
---
gnu/system/installer/filesystems.scm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/gnu/system/installer/filesystems.scm
b/gnu/system/installer/filesystems.scm
index 5040eca..a068125 100644
--- a/gnu/system/installer/filesystems.scm
+++ b/gnu/system/installer/filesystems.scm
@@ -23,6 +23,7 @@
#:use-module (gnu system installer page)
#:use-module (gnu system installer misc)
#:use-module (gnu system installer utils)
+ #:use-module (guix build utils)
#:use-module (gurses buttons)
#:use-module (gurses menu)
#:use-module (ncurses curses)
@@ -46,11 +47,11 @@
(N_ "You must specify a mount point for the root (/)."))
- (and (< (size-of-partition (find-mount-device "/gnu" mount-points))
+ (and (< (size-of-partition (find-mount-device (%store-directory)
mount-points))
minimum-store-size)
(format #f
- (N_ "The filesystem for /gnu requires at least ~aGB.")
- (/ minimum-store-size 1000)))
+ (N_ "The filesystem for ~a requires at least ~aGB.")
+ (%store-directory) (/ minimum-store-size 1000)))
(let loop ((ll mount-points)
(ac '()))
- 64/80: installer: Add a console-keymap service., (continued)
- 64/80: installer: Add a console-keymap service., John Darrington, 2017/01/03
- 71/80: installer: Make setting up of the network a prerequisite., John Darrington, 2017/01/03
- 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 <=
- 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, 2017/01/03
- 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