From cf4b2824828add4e9ec249275c9dbb466600c236 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Tue, 30 Jun 2015 19:58:10 -0700 Subject: [PATCH 1/2] disk_util: convert some tabs to spaces --- build_library/disk_util | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_library/disk_util b/build_library/disk_util index 49446106ed..3ab9d1ab87 100755 --- a/build_library/disk_util +++ b/build_library/disk_util @@ -65,7 +65,7 @@ def LoadPartitionConfig(options): metadata = config['metadata'] base = config['layouts']['base'] for key in ('part_alignment', 'disk_alignment', - 'block_size', 'fs_block_size'): + 'block_size', 'fs_block_size'): metadata[key] = int(metadata[key]) except KeyError as e: raise InvalidLayout('Metadata is missing required entries: %s' % e) From 7232e74bcce265545501256e18d9783ab0955f2c Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Tue, 30 Jun 2015 20:04:41 -0700 Subject: [PATCH 2/2] disk_util: use the dummy disk UUID This dummy UUID (00000000-0000-0000-0000-000000000001) is used to signify to Ignition that the disk is uninitialized. --- build_library/disk_util | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build_library/disk_util b/build_library/disk_util index 3ab9d1ab87..91cbf58cb9 100755 --- a/build_library/disk_util +++ b/build_library/disk_util @@ -269,7 +269,8 @@ def WritePartitionTable(options, config=None, partitions=None): config, partitions = LoadPartitionConfig(options) 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: # If we are not creating a fresh image all partitions must be compatible. GetPartitionTableFromImage(options, config, partitions)