summary refs log tree commit diff
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:06:32 +0200
commit66b53c2c72b4aad4e6621273b9a5ca8c6f632c63 (patch)
treec7edfa6026e0e90af4d54e6883d3fb7d858bb68c
parent74f01059cb30827de92f75e99a3bb4ee31c19118 (diff)
downloadguix-66b53c2c72b4aad4e6621273b9a5ca8c6f632c63.tar.gz
installer: tests: Don't install to a CD/DVD.
* gnu/installer/tests.scm (choose-partitioning): Use 'find' to select
the disk.
-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.