mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-10 14:36:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #427 from crawford/disk_util

Browse Source 
disk_util: use the dummy disk UUID
This commit is contained in:
Alex Crawford 2015-07-15 00:03:12 -07:00
commit 0b0aa88be3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build_library/disk_util
View File

@ -65,7 +65,7 @@ def LoadPartitionConfig(options):
metadata = config['metadata'] metadata = config['metadata']
base = config['layouts']['base'] base = config['layouts']['base']
for key in ('part_alignment', 'disk_alignment', for key in ('part_alignment', 'disk_alignment',
'block_size', 'fs_block_size'): 'block_size', 'fs_block_size'):
metadata[key] = int(metadata[key]) metadata[key] = int(metadata[key])
except KeyError as e: except KeyError as e:
raise InvalidLayout('Metadata is missing required entries: %s' % e) raise InvalidLayout('Metadata is missing required entries: %s' % e)
@ -269,7 +269,8 @@ def WritePartitionTable(options, config=None, partitions=None):
config, partitions = LoadPartitionConfig(options) config, partitions = LoadPartitionConfig(options)
if options.create: if options.create:
Cgpt('create', '-c', '-s', config['metadata']['blocks'], options.disk_image) Cgpt('create', '-c', '-s', config['metadata']['blocks'],
'-g', '00000000-0000-0000-0000-000000000001', options.disk_image)
else: else:
# If we are not creating a fresh image all partitions must be compatible. # If we are not creating a fresh image all partitions must be compatible.
GetPartitionTableFromImage(options, config, partitions) GetPartitionTableFromImage(options, config, partitions)