ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: Pass '-F qcow2' to 'qemu-img create'.

Browse source 
Fixes a regression introduced in
0b5e128750, whereby 'qemu-img create ...'
as used here would fail with:

  qemu-img: disk.img: Backing file specified without backing format

thereby breaking tests from (gnu tests install).

* gnu/tests/install.scm (qemu-command/writable-image): Pass "-F qcow2".
This commit is contained in:
Ludovic Courtès 2021-10-18 09:58:18 +02:00
parent 3fa778b561
commit 3fbf38aca2
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gnu/tests/install.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017, 2019, 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2019, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
@ -355,7 +355,7 @@ (define* (qemu-command/writable-image image
(format #t "creating writable image from '~a'...~%" image) (format #t "creating writable image from '~a'...~%" image)
(unless (zero? (system* #+(file-append qemu-minimal (unless (zero? (system* #+(file-append qemu-minimal
"/bin/qemu-img") "/bin/qemu-img")
"create" "-f" "qcow2" "create" "-f" "qcow2" "-F" "qcow2"
"-o" "-o"
(string-append "backing_file=" image) (string-append "backing_file=" image)
"disk.img")) "disk.img"))