Merge ~raharper/curtin:fix/lp1785356-switch-to-uuid4 into curtin:master

[Ryan Harper]

block: use uuid4 (random) when autogenerating UUIDS for filesystems

The use of uuid1 (timebased) results in UUID values that are visually
hard to distingish. Instead use uuid4 which generates a random
UUID value to provide a more visually distinctive /etc/fstab.

Updated tools/xkvm to add a virtio-rng device when launching VMs

LP: #1785356

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:005d919a9c174d9a24e21a7188ac43952c310551
https://jenkins.ubuntu.com/server/job/curtin-ci/1011/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/1011
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/1011
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/1011
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=torkoal/1011

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/1011/rebuild

review: Approve (continuous-integration)

[Scott Moser (smoser)]

review: Approve

diff --git a/curtin/block/mkfs.py b/curtin/block/mkfs.py
index a199d05..f39017c 100644
--- a/curtin/block/mkfs.py
+++ b/curtin/block/mkfs.py
@@ -8,7 +8,7 @@ from curtin import block
 
 import string
 import os
-from uuid import uuid1
+from uuid import uuid4
 
 mkfs_commands = {
     "btrfs": "mkfs.btrfs",
@@ -191,7 +191,7 @@ def mkfs(path, fstype, strict=False, label=None, uuid=None, force=False):
 
     # If uuid is not specified, generate one and try to use it
     if uuid is None:
-        uuid = str(uuid1())
+        uuid = str(uuid4())
     cmd.extend(get_flag_mapping("uuid", fs_family, param=uuid, strict=strict))
 
     if fs_family == "fat":
diff --git a/tools/xkvm b/tools/xkvm
index deb769e..dbcba6f 100755
--- a/tools/xkvm
+++ b/tools/xkvm
@@ -648,9 +648,13 @@ main() {
 
     local bus_devices
     bus_devices=( -device "$virtio_scsi_bus,id=virtio-scsi-xkvm" )
-    cmd=( "${kvmcmd[@]}" "${archopts[@]}" 
+    local rng_devices
+    rng_devices=( -object "rng-random,filename=/dev/urandom,id=rng0"
+                  -device "virtio-rng-pci,rng=rng0" )
+    cmd=( "${kvmcmd[@]}" "${archopts[@]}"
           "${bios_opts[@]}"
           "${bus_devices[@]}"
+          "${rng_devices[@]}"
           "${netargs[@]}"
           "${diskargs[@]}" "${pt[@]}" )
     local pcmd=$(quote_cmd "${cmd[@]}")