aboutsummaryrefslogtreecommitdiff
path: root/gnu/installer/tests.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-04-10 15:44:30 +0200
committerLudovic Courtès <ludo@gnu.org>2020-04-10 16:02:52 +0200
commit475d48145d529be23d97b2bb92d2734365733bba (patch)
treeea9ccce5f78bd6fc5694b958c1665aa68f33a73d /gnu/installer/tests.scm
parent76026b5f519826291b3878eee9fb9580d2db5238 (diff)
downloadguix-475d48145d529be23d97b2bb92d2734365733bba.tar
guix-475d48145d529be23d97b2bb92d2734365733bba.tar.gz
installer: tests: Don't install to a CD/DVD.
* gnu/installer/tests.scm (choose-partitioning): Use 'find' to select the disk.
Diffstat (limited to 'gnu/installer/tests.scm')
-rw-r--r--gnu/installer/tests.scm9
1 files changed, 7 insertions, 2 deletions
diff --git a/gnu/installer/tests.scm b/gnu/installer/tests.scm
index 8ae80e4d7e..58bf0a2700 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.