From ba532952b1f7298ad494ebedb3528aa08d48ef9c Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Sun, 5 Jan 2014 13:55:52 -0800
Subject: [PATCH] fix(disk_util): Fix layout inheritance in config
 verification.

---
 build_library/disk_util | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/build_library/disk_util b/build_library/disk_util
index b562eda6b2..3bf722ece7 100755
--- a/build_library/disk_util
+++ b/build_library/disk_util
@@ -79,12 +79,13 @@ def LoadPartitionConfig(options):
       for int_key in integer_layout_keys.intersection(part_keys):
         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':
         continue
 
-      if base:
-        part_keys.update(base.iterkeys())
-
       missing_keys = required_layout_keys - part_keys
       if missing_keys:
         raise InvalidLayout('Missing items in partition %s %s: %s' %