[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/07: installer: tests: Don't install to a CD/DVD.
From: |
guix-commits |
Subject: |
06/07: installer: tests: Don't install to a CD/DVD. |
Date: |
Fri, 10 Apr 2020 10:03:10 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 475d48145d529be23d97b2bb92d2734365733bba
Author: Ludovic Courtès <address@hidden>
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.
- branch master updated (1a24df4 -> a860edd), guix-commits, 2020/04/10
- 04/07: lint: 'check-patch-file-names' restricts to shorter file names., guix-commits, 2020/04/10
- 05/07: vm: 'system-disk-image' honors #:substitutable? for ISO9660 images., guix-commits, 2020/04/10
- 01/07: gnu: binutils: Shorten file names of MinGW patches., guix-commits, 2020/04/10
- 07/07: tests: Run guided installation tests from an ISO image., guix-commits, 2020/04/10
- 02/07: gnu: akonadi: Shorten file name of patch., guix-commits, 2020/04/10
- 03/07: gnu: sdl-pango: Shorten file name of patch., guix-commits, 2020/04/10
- 06/07: installer: tests: Don't install to a CD/DVD.,
guix-commits <=