[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/22: installer: Deal with partition tables which are (partially) corru
From: |
John Darrington |
Subject: |
08/22: installer: Deal with partition tables which are (partially) corrupt. |
Date: |
Tue, 27 Dec 2016 06:02:09 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit 248b419d63cfe07157336ee36677ec8012f0da72
Author: John Darrington <address@hidden>
Date: Sat Dec 24 15:03:06 2016 +0100
installer: Deal with partition tables which are (partially) corrupt.
* gnu/system/installer/partition-reader.scm (read-partition-info): Change
read-line to read-delimited.
---
gnu/system/installer/partition-reader.scm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/gnu/system/installer/partition-reader.scm
b/gnu/system/installer/partition-reader.scm
index c0db6a7..d55f798 100644
--- a/gnu/system/installer/partition-reader.scm
+++ b/gnu/system/installer/partition-reader.scm
@@ -144,7 +144,9 @@ number of Megabytes"
(define (read-partition-info)
(define (read-partition-info' port l)
- (let ((line (read-line port)))
+ ;; Under certain circumstances, it seems that parted writes
+ ;; ^M characters to stdout! Plain read-line cannot therefore work.
+ (let ((line (read-delimited "\n\r" port)))
(if (eof-object? line)
l
(if (or (zero? (string-length line))
- 22/22: gnu: Add guix to the path environment for the guix-installer service., (continued)
- 22/22: gnu: Add guix to the path environment for the guix-installer service., John Darrington, 2016/12/27
- 09/22: installer: Add a variable to represent the minimum recommended store size., John Darrington, 2016/12/27
- 17/22: installer: Replace some instances of "car"., John Darrington, 2016/12/27
- 20/22: install: Define new procedure pipe-cmd and use it to implement window-pipe., John Darrington, 2016/12/27
- 03/22: installer: Make "interfaces" return an alist., John Darrington, 2016/12/27
- 13/22: installer: Add path to mount/umount commands in installer service., John Darrington, 2016/12/27
- 10/22: gnu: Add service to start the installer in installation-os., John Darrington, 2016/12/27
- 11/22: installer: Add a task to actually call guix system init., John Darrington, 2016/12/27
- 18/22: installer: New predicate valid-hostname?, John Darrington, 2016/12/27
- 21/22: installer: Correct bugs generating the configuration., John Darrington, 2016/12/27
- 08/22: installer: Deal with partition tables which are (partially) corrupt.,
John Darrington <=
- 05/22: installer: Add a new menu to configure wireless interfaces., John Darrington, 2016/12/27
- 07/22: installer: Let the kernel know about (possibly) changed partitions., John Darrington, 2016/12/27
- 19/22: installer: Ensure that all mount-points have a file system., John Darrington, 2016/12/27
- 12/22: installer: Write the configuration to a temporary file., John Darrington, 2016/12/27