| From 13f1f32ae3c73d5e55327ff66346632415787c3a Mon Sep 17 00:00:00 2001 |
| From: Bertrand Jacquin <bertrand@jacquin.bzh> |
| Date: Sun, 11 Oct 2020 22:25:56 +0100 |
| Subject: [PATCH] machine-id-setup: generate machine-id from DMI product ID on |
| Amazon EC2 |
| |
| Amazon EC2 Nitro hypervisor is technically based on KVM[1]. |
| |
| [1] https://aws.amazon.com/ec2/faqs/ |
| --- |
| src/shared/machine-id-setup.c | 7 +------ |
| 1 file changed, 1 insertion(+), 6 deletions(-) |
| |
| diff --git a/src/shared/machine-id-setup.c b/src/shared/machine-id-setup.c |
| index 6d15f9cd09..7943c016bc 100644 |
| --- a/src/shared/machine-id-setup.c |
| +++ b/src/shared/machine-id-setup.c |
| @@ -60,7 +60,7 @@ static int generate_machine_id(const char *root, sd_id128_t *ret) { |
| return 0; |
| } |
| |
| - } else if (IN_SET(detect_vm(), VIRTUALIZATION_KVM, VIRTUALIZATION_AMAZON, VIRTUALIZATION_QEMU)) { |
| + } else if (IN_SET(detect_vm(), VIRTUALIZATION_KVM, VIRTUALIZATION_XEN, VIRTUALIZATION_VMWARE, VIRTUALIZATION_AMAZON, VIRTUALIZATION_QEMU)) { |
| |
| /* If we are not running in a container, see if we are running in a VM that provides |
| * a system UUID via the SMBIOS/DMI interfaces. Such environments include QEMU/KVM |
| -- |
| 2.33.1.1089.g2158813163f-goog |
| |