jmd pushed a commit to branch wip-installer
in repository guix.
commit 88bda066b96918aa74b3bd4926a7801f012a5c49
Author: John Darrington <[email protected]>
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 '()))
