summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-08-23 15:11:35 +0200
committerLudovic Courtès <ludo@gnu.org>2013-08-23 15:11:35 +0200
commitbaed8816fcd6665319c342a1d4c117198af33dc2 (patch)
tree6d80b5d0fe8f6c293457fba904fcf91eedadbeeb /gnu
parent290d437097094f82e53eac602b7a6b6037e89f2a (diff)
downloadguix-patches-baed8816fcd6665319c342a1d4c117198af33dc2.tar
guix-patches-baed8816fcd6665319c342a1d4c117198af33dc2.tar.gz
gnu: Have `qemu-image' explicitly reboot when done.
* gnu/system/vm.scm (qemu-image): Call `reboot' when we're done. Change `menuentry' title.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/system/vm.scm8
1 files changed, 5 insertions, 3 deletions
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 83c9c7d01a..bc5677963d 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -197,10 +197,11 @@ DISK-IMAGE-SIZE bytes and return it."
(call-with-output-file "/fs/boot/grub/grub.cfg"
(lambda (p)
(display "
-set timeout=10
+set default=1
+set timeout=5
search.file /boot/bzImage
-menuentry \"Boot-to-Guile! Happy Birthday Guile 2.0! (Guile, Guix & co.)\" {
+menuentry \"Boot-to-Guile! (GNU System technology preview)\" {
linux /boot/bzImage --repl
initrd /boot/initrd
}" p)))
@@ -209,7 +210,8 @@ menuentry \"Boot-to-Guile! Happy Birthday Guile 2.0! (Guile, Guix & co.)\" {
"--boot-directory" "/fs/boot"
"/dev/vda"))
(zero?
- (system* umount "/fs"))))))))
+ (system* umount "/fs"))
+ (reboot)))))))
`(("parted" ,parted)
("grub" ,grub)
("e2fsprogs" ,e2fsprogs)