guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

55/197: installer: Use global variable instead of string literal for "/g


From: Danny Milosavljevic
Subject: 55/197: installer: Use global variable instead of string literal for "/gnu".
Date: Mon, 3 Jul 2017 20:36:59 -0400 (EDT)

dannym pushed a commit to branch wip-installer-2
in repository guix.

commit 8c4bbec1d882b2caab37e7eb0d3be93e2badeef5
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 '()))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]