civodul pushed a commit to branch version-1.1.0
in repository guix.
commit 66b53c2c72b4aad4e6621273b9a5ca8c6f632c63
Author: Ludovic Courtès <[email protected]>
AuthorDate: Fri Apr 10 15:44:30 2020 +0200
installer: tests: Don't install to a CD/DVD.
* gnu/installer/tests.scm (choose-partitioning): Use 'find' to select
the disk.
---
gnu/installer/tests.scm | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/gnu/installer/tests.scm b/gnu/installer/tests.scm
index 8ae80e4..58bf0a2 100644
--- a/gnu/installer/tests.scm
+++ b/gnu/installer/tests.scm
@@ -296,8 +296,13 @@ file, actually starting the installation process."
encrypted
not-encrypted))
((list-selection (title "Disk") (multiple-choices? #f)
- (items (,disk _ ...)))
- disk)
+ (items (,disks ...)))
+ ;; When running the installation from an ISO image, the CD/DVD drive
+ ;; shows up in the list. Avoid it.
+ (find (lambda (disk)
+ (not (or (string-contains disk "DVD")
+ (string-contains disk "CD-ROM"))))
+ disks))
;; The "Partition table" dialog pops up only if there's not already a
;; partition table.
