From aab896e2135362ab126830c73284d4af0baad88a Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Thu, 13 Apr 2023 13:51:31 +1000 Subject: [PATCH] virt: Further improve detection of EC2 metal instances Commit f90eea7d18d9ebe88e6a66cd7a86b618def8945d virt: Improve detection of EC2 metal instances Added support for detecting EC2 metal instances via the product name in DMI by testing for the ".metal" suffix. Unfortunately this doesn't cover all cases, as there are going to be instance types where ".metal" is not a suffix (ie, .metal-16xl, .metal-32xl, ...) This modifies the logic to also allow those new forms. Signed-off-by: Benjamin Herrenschmidt --- src/basic/virt.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/basic/virt.c b/src/basic/virt.c index f264cc6eb3d78..aadc923bb54f9 100644 --- a/src/basic/virt.c +++ b/src/basic/virt.c @@ -264,6 +264,7 @@ static Virtualization detect_vm_dmi(void) { * so we fallback to using the product name which is less restricted * to distinguish metal systems from virtualized instances */ _cleanup_free_ char *s = NULL; + const char *e; r = read_full_virtual_file("/sys/class/dmi/id/product_name", &s, NULL); /* In EC2, virtualized is much more common than metal, so if for some reason @@ -273,8 +274,9 @@ static Virtualization detect_vm_dmi(void) { " assuming virtualized: %m"); return VIRTUALIZATION_AMAZON; } - if (endswith(truncate_nl(s), ".metal")) { - log_debug("DMI product name ends with '.metal', assuming no virtualization"); + e = strstrafter(truncate_nl(s), ".metal"); + if (e && IN_SET(*e, 0, '-')) { + log_debug("DMI product name has '.metal', assuming no virtualization"); return VIRTUALIZATION_NONE; } else return VIRTUALIZATION_AMAZON;