mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-23 22:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(disk_util): Fix layout inheritance in config verification.

Browse Source
This commit is contained in:
Michael Marineau 2014-01-05 13:55:52 -08:00
parent 3546256597
commit ba532952b1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build_library/disk_util
View File

@ -79,12 +79,13 @@ def LoadPartitionConfig(options):
for int_key in integer_layout_keys.intersection(part_keys): for int_key in integer_layout_keys.intersection(part_keys):
part[int_key] = int(part[int_key]) part[int_key] = int(part[int_key])
if base:
part_base = base.get(part_num, {})
part_keys.update(part_base.iterkeys())
if part.get('type', None) == 'blank': if part.get('type', None) == 'blank':
continue continue
if base:
part_keys.update(base.iterkeys())
missing_keys = required_layout_keys - part_keys missing_keys = required_layout_keys - part_keys
if missing_keys: if missing_keys:
raise InvalidLayout('Missing items in partition %s %s: %s' % raise InvalidLayout('Missing items in partition %s %s: %s' %