[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 '()))
- 36/197: installer: Ensure that all mount-points have a file system., (continued)
- 36/197: installer: Ensure that all mount-points have a file system., Danny Milosavljevic, 2017/07/03
- 39/197: installer: Replace an instance of cdr with match., Danny Milosavljevic, 2017/07/03
- 46/197: installer: Replace "%temporary-configuration-file-port" with "config-file"., Danny Milosavljevic, 2017/07/03
- 30/197: installer: Write the configuration to a temporary file., Danny Milosavljevic, 2017/07/03
- 24/197: installer: Add a new menu to configure wireless interfaces., Danny Milosavljevic, 2017/07/03
- 49/197: installer: Replace spawned mount command with the mount syscall., Danny Milosavljevic, 2017/07/03
- 44/197: installer: Use consistent window heights., Danny Milosavljevic, 2017/07/03
- 52/197: installer: Prevent the user specifying the same mount point twice., Danny Milosavljevic, 2017/07/03
- 51/197: installer: Allow users to remove mount points during configuration., Danny Milosavljevic, 2017/07/03
- 14/197: installer: Add procedures to replace car/cdr since these are frounded upon by Guile gurus., Danny Milosavljevic, 2017/07/03
- 55/197: installer: Use global variable instead of string literal for "/gnu".,
Danny Milosavljevic <=
- 54/197: installer: Change the order of the filesystem task conditions., Danny Milosavljevic, 2017/07/03
- 60/197: installer: Do not allow forms to set the cursor visibility., Danny Milosavljevic, 2017/07/03
- 56/197: installer: Do not use /tmp for holding the configuration., Danny Milosavljevic, 2017/07/03
- 66/197: installer: Add option to final page to reboot the system., Danny Milosavljevic, 2017/07/03
- 71/197: installer: Add confidence indicator., Danny Milosavljevic, 2017/07/03
- 67/197: installer: Add predicate for the network task., Danny Milosavljevic, 2017/07/03
- 74/197: installer: Remove explicit calls to curs-set from pages., Danny Milosavljevic, 2017/07/03
- 64/197: installer: Make setting up of the network a prerequisite., Danny Milosavljevic, 2017/07/03
- 80/197: installer: Ignore case in button accelerators., Danny Milosavljevic, 2017/07/03
- 86/197: installer: slurp: Ignore blank lines in output., Danny Milosavljevic, 2017/07/03