[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
19/21: installer: Use global variable instead of string literal for "/gn
From: |
John Darrington |
Subject: |
19/21: installer: Use global variable instead of string literal for "/gnu". |
Date: |
Sat, 31 Dec 2016 14:54:18 +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 '()))
- 01/21: installer: Add wireless-tools bin directory to PATH., (continued)
- 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, 2016/12/31
- 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 <=
- 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