x
/
cloudbase-init
Code Issues Proposed changes

Support 'cidata' disk label for configdrive. 

Change-Id: Ia774374edc358384139fe798b77a967037b8c540
This commit is contained in:
Brett Holman 2024-04-03 16:25:00 -06:00
parent 4bb6895f11
commit 3c0760a89f
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cloudbaseinit/metadata/services/configdrive.py
View File

@ -27,4 +27,4 @@ class ConfigDriveService(baseconfigdrive.BaseConfigDriveService,
def __init__(self):
super(ConfigDriveService, self).__init__(
'config-2', 'openstack\\latest\\meta_data.json')
['config-2', 'cidata'], 'openstack\\latest\\meta_data.json')

5
cloudbaseinit/utils/windows/vfat.py
View File

@ -49,7 +49,10 @@ def is_vfat_drive(osutils, drive_path, drive_label):
LOG.debug("Obtained label information for drive %r: %r", drive_path, out)
out = out.decode().strip()
match = VOLUME_LABEL_REGEX.search(out)
drive_labels = [drive_label.lower(), drive_label.upper()]
drive_labels = [
*[drive.lower() for drive in drive_label],
*[drive.upper() for drive in drive_label],
]
return match.group(1) in drive_labels if match else False