1
0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-05-22 09:05:54 +02:00

Merge branch 'master' into staging

This commit is contained in:
Leo Famulari
2021-01-25 15:21:09 -05:00
177 changed files with 7933 additions and 2629 deletions
+2 -2
View File
@@ -222,7 +222,7 @@ reboot\n")
#:imported-modules '((gnu services herd)
(gnu installer tests)
(guix combinators))))
(installation-image-type 'raw)
(installation-image-type 'efi-raw)
(install-size 'guess)
(target-size (* 2200 MiB)))
"Run SCRIPT (a shell script following the system installation procedure) in
@@ -272,7 +272,7 @@ packages defined in installation-os."
"-no-reboot"
"-m" "1200"
#$@(cond
((eq? 'raw installation-image-type)
((eq? 'efi-raw installation-image-type)
#~("-drive"
,(string-append "file=" #$image
",if=virtio,readonly")))