[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
72/80: installer: Ensure that all mount points are absolute paths.
From: |
John Darrington |
Subject: |
72/80: installer: Ensure that all mount points are absolute paths. |
Date: |
Tue, 3 Jan 2017 15:49:46 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit 41f6d7771356f07c56378029c88c9c63c8d421cc
Author: John Darrington <address@hidden>
Date: Mon Jan 2 09:32:36 2017 +0100
installer: Ensure that all mount points are absolute paths.
* gnu/system/installer/filesystems.scm (filesystem-task-incomplete-reason):
Add
condition that all mount points must be absolute.
---
gnu/system/installer/filesystems.scm | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/gnu/system/installer/filesystems.scm
b/gnu/system/installer/filesystems.scm
index a068125..bde276d 100644
--- a/gnu/system/installer/filesystems.scm
+++ b/gnu/system/installer/filesystems.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016 John Darrington <address@hidden>
+;;; Copyright © 2016, 2017 John Darrington <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -47,6 +47,22 @@
(N_ "You must specify a mount point for the root (/)."))
+ (let ((non-absolute-list (fold (lambda (x prev)
+ (if (absolute-file-name? (cdr x))
+ prev
+ (cons (cdr x) prev)))
+ '()
+ mount-points)))
+ (and (not (null? non-absolute-list))
+ (ngettext
+ (format #f
+ (N_ "The mount point ~s is a relative path. All mount
points must be absolute.")
+ (car non-absolute-list))
+ (format #f
+ (N_ "The mount points ~s are relative paths. All mount
points must be absolute.")
+ non-absolute-list)
+ (length non-absolute-list))))
+
(and (< (size-of-partition (find-mount-device (%store-directory)
mount-points))
minimum-store-size)
(format #f
- 43/80: gnu: Add guix to the path environment for the guix-installer service., (continued)
- 43/80: gnu: Add guix to the path environment for the guix-installer service., John Darrington, 2017/01/03
- 45/80: installer: Replace an instance of cdr with match., John Darrington, 2017/01/03
- 32/80: installer: Add a task to actually call guix system init., John Darrington, 2017/01/03
- 38/80: installer: Replace some instances of "car"., John Darrington, 2017/01/03
- 26/80: installer: Add a new menu to configure wireless interfaces., John Darrington, 2017/01/03
- 59/80: installer: Prevent the user specifying the same mount point twice., John Darrington, 2017/01/03
- 57/80: installer: Issue message to user on failure of filesystems task., John Darrington, 2017/01/03
- 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 <=
- 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, 2017/01/03
- 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