diff options
author | Ludovic Courtès <ludo@gnu.org> | 2014-05-03 12:16:10 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2014-05-03 12:16:23 +0200 |
commit | 03ddfaf5fb5fab78f7180089158bea0494072b3c (patch) | |
tree | f4a10226ab86aed01ce9e9603d6532fe9fe2bcaa /guix/build/vm.scm | |
parent | e20fd1bf80d8038b56abe29d6bf0f1d7150fddd5 (diff) | |
download | guix-patches-03ddfaf5fb5fab78f7180089158bea0494072b3c.tar guix-patches-03ddfaf5fb5fab78f7180089158bea0494072b3c.tar.gz |
vm: Make root file system type a parameter, and default to ext4.
* gnu/system/vm.scm (qemu-image): Add #:file-system-type parameter.
Pass it to 'initialize-hard-disk'.
* guix/build/linux-initrd.scm (mount-root-file-system): Always honor
TYPE.
(boot-system): Change #:root-fs-type to default to "ext4". Update
docstring.
* guix/build/vm.scm (initialize-hard-disk): Remove #:mkfs parameter; add
#:file-system-type. Adjust 'mkfs' invocation and 'mount' call to
honor #:file-system-type.
Diffstat (limited to 'guix/build/vm.scm')
-rw-r--r-- | guix/build/vm.scm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/guix/build/vm.scm b/guix/build/vm.scm index 33c898d968..1d1abad1dd 100644 --- a/guix/build/vm.scm +++ b/guix/build/vm.scm @@ -183,7 +183,7 @@ as created and modified at the Epoch." (define* (initialize-hard-disk #:key grub.cfg disk-image-size - (mkfs "mkfs.ext3") + (file-system-type "ext4") initialize-store? (closures-to-copy '()) (directives '())) @@ -192,13 +192,14 @@ as created and modified at the Epoch." (- disk-image-size (* 5 (expt 2 20)))) (error "failed to create partition table")) - (display "creating ext3 partition...\n") - (unless (zero? (system* mkfs "-F" "/dev/sda1")) + (format #t "creating ~a partition...\n" file-system-type) + (unless (zero? (system* (string-append "mkfs." file-system-type) + "-F" "/dev/sda1")) (error "failed to create partition")) (display "mounting partition...\n") (mkdir "/fs") - (mount "/dev/sda1" "/fs" "ext3") + (mount "/dev/sda1" "/fs" file-system-type) (when (pair? closures-to-copy) ;; Populate the store. |