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 /gnu/system | |
| parent | e20fd1bf80d8038b56abe29d6bf0f1d7150fddd5 (diff) | |
| download | patches-03ddfaf5fb5fab78f7180089158bea0494072b3c.tar 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 'gnu/system')
| -rw-r--r-- | gnu/system/vm.scm | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index c080317415..867e01ad5f 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -188,13 +188,15 @@ made available under the /xchg CIFS share." (system (%current-system)) (qemu qemu-headless) (disk-image-size (* 100 (expt 2 20))) + (file-system-type "ext4") grub-configuration (initialize-store? #f) (populate #f) (inputs-to-copy '())) - "Return a bootable, stand-alone QEMU image. The returned image is a full -disk image, with a GRUB installation that uses GRUB-CONFIGURATION as its -configuration file (GRUB-CONFIGURATION must be the name of a file in the VM.) + "Return a bootable, stand-alone QEMU image, with a root partition of type +FILE-SYSTEM-TYPE. The returned image is a full disk image, with a GRUB +installation that uses GRUB-CONFIGURATION as its configuration +file (GRUB-CONFIGURATION must be the name of a file in the VM.) INPUTS-TO-COPY is a list of inputs (as for packages) whose closure is copied into the image being built. When INITIALIZE-STORE? is true, initialize the @@ -235,6 +237,7 @@ such as /etc files." (initialize-hard-disk #:grub.cfg #$grub-configuration #:closures-to-copy graphs #:disk-image-size #$disk-image-size + #:file-system-type #$file-system-type #:initialize-store? #$initialize-store? #:directives '#$populate) (reboot)))) @@ -315,7 +318,7 @@ environment with the store shared with the host." (file-systems (list (file-system (mount-point "/") (device "/dev/vda1") - (type "ext3")) + (type "ext4")) (file-system (mount-point (%store-prefix)) (device "store") |