diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-05-24 02:34:08 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-05-24 02:34:08 -0400 |
| commit | 9d10a63402e3c3dcda288b9370d04568dfa20ea6 (patch) | |
| tree | 12705e0e3752f73d309a0387bb75674e83d33062 /gnu/system | |
| parent | 4935701a4a31212e0cf1b2375832fb7ecd3d8809 (diff) | |
| parent | 11c237f54e4de5916e204aba574ab15f7818a3f5 (diff) | |
| download | guix-9d10a63402e3c3dcda288b9370d04568dfa20ea6.tar guix-9d10a63402e3c3dcda288b9370d04568dfa20ea6.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/linux-initrd.scm | 2 | ||||
| -rw-r--r-- | gnu/system/vm.scm | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index e0cb59c009..d73ebfd8d3 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -283,7 +283,7 @@ FILE-SYSTEMS." (define virtio-modules ;; Modules for Linux para-virtualized devices, for use in QEMU guests. '("virtio_pci" "virtio_balloon" "virtio_blk" "virtio_net" - "virtio_console")) + "virtio_console" "virtio-rng")) `("ahci" ;for SATA controllers "usb-storage" "uas" ;for the installation image etc. diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 09a11af863..eb73b5ca7a 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -752,6 +752,10 @@ with the host. When FULL-BOOT? is true, return an image that does a complete boot sequence, bootloaded included; thus, make a disk image that contains everything the bootloader refers to: OS kernel, initrd, bootloader data, etc." + (define root-uuid + ;; Use a fixed UUID to improve determinism. + (operating-system-uuid os 'dce)) + (mlet* %store-monad ((os-drv (operating-system-derivation os)) (bootcfg (operating-system-bootcfg os))) ;; XXX: When FULL-BOOT? is true, we end up creating an image that contains @@ -763,6 +767,7 @@ bootloader refers to: OS kernel, initrd, bootloader data, etc." #:bootloader (bootloader-configuration-bootloader (operating-system-bootloader os)) #:disk-image-size disk-image-size + #:file-system-uuid root-uuid #:inputs (if full-boot? `(("bootcfg" ,bootcfg)) '()) |