From 1e57488f0dd545d4f7ae1b85ff7b902b6bcd1b45 Mon Sep 17 00:00:00 2001 From: Robert Caliman Date: Fri, 28 Aug 2026 14:30:32 +0300 Subject: [PATCH] Add changes for 7mm disk without a RAID volume --- confluent_osdeploy/common/profile/scripts/getinstalldisk | 7 ++++++- .../esxi7/profiles/hypervisor/scripts/getinstalldisk | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/confluent_osdeploy/common/profile/scripts/getinstalldisk b/confluent_osdeploy/common/profile/scripts/getinstalldisk index 96f6d447..cb65e9bf 100644 --- a/confluent_osdeploy/common/profile/scripts/getinstalldisk +++ b/confluent_osdeploy/common/profile/scripts/getinstalldisk @@ -14,6 +14,7 @@ PRIORITY_MODELS = ('m.2 nvme 2-bay raid kit', 'thinksystem m.2', 'thinksystem_m.2', 'thinksystem 7mm', + 'thinksystem_7mm', 'thinksystem_7mm_vd', 'b540p-2hs', # 7mm or M.2 in rear 'b540d-2hs', # M.2 in E3.S or 2.5inch @@ -29,6 +30,8 @@ PRIORITY_MODELS = ('m.2 nvme 2-bay raid kit', 'raid b545i-2i', 'raid_b545-2i') +BOOT_SLOT_KEYWORDS = ('m.2 socket', '7mm') + class DiskInfo(object): def __init__(self, devname, slotinfo=None): if devname.startswith('nvme') and 'c' in devname: @@ -199,7 +202,9 @@ def get_m2_slot_info(): slots = get_dmi_type9_info() m2slots = {} for slot in slots.values(): - if 'm.2 socket' not in slot.get('type', '').lower(): + label = '{0} {1}'.format( + slot.get('type', ''), slot.get('designation', '')).lower() + if not any(x in label for x in BOOT_SLOT_KEYWORDS): continue busaddr = slot.get('bus_address', None) if not busaddr: diff --git a/confluent_osdeploy/esxi7/profiles/hypervisor/scripts/getinstalldisk b/confluent_osdeploy/esxi7/profiles/hypervisor/scripts/getinstalldisk index 48c6f05e..9853599b 100644 --- a/confluent_osdeploy/esxi7/profiles/hypervisor/scripts/getinstalldisk +++ b/confluent_osdeploy/esxi7/profiles/hypervisor/scripts/getinstalldisk @@ -73,6 +73,7 @@ PRIORITY_MODELS = ('m.2 nvme 2-bay raid kit', 'thinksystem m.2', 'thinksystem_m.2', 'thinksystem 7mm', + 'thinksystem_7mm', 'thinksystem_7mm_vd', 'b540p-2hs', # 7mm or M.2 in rear 'b540d-2hs', # M.2 in E3.S or 2.5inch