From de262e86c77f1dcb4e761ed7243ef022dd2e084e Mon Sep 17 00:00:00 2001 From: Don Garrett Date: Fri, 12 Oct 2012 14:37:52 -0700 Subject: [PATCH] Increase the rootfs to 1G in size. We are coming close to filling the rootfs size, so just make it bigger. TEST=build_image, image_to_live, recovery, USB install, trybot BUG=chromium-os:35086 CQ-DEPEND=CL:*27626 CQ-DEPEND=CL:*27627 CQ-DEPEND=CL:*27628 CQ-DEPEND=CL:*27632 Change-Id: Ida27761dbcf59e5553b10789a068e9cd6c1887ee Reviewed-on: https://gerrit.chromium.org/gerrit/35477 Reviewed-by: Mike Frysinger Tested-by: Don Garrett Commit-Ready: Don Garrett --- build_library/cgpt.py | 4 +++- build_library/legacy_disk_layout.json | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/build_library/cgpt.py b/build_library/cgpt.py index 8ea741c279..3c811c9ffc 100755 --- a/build_library/cgpt.py +++ b/build_library/cgpt.py @@ -70,7 +70,9 @@ def LoadPartitionConfig(filename): part['fs_bytes'] = part['fs_blocks'] * metadata['fs_block_size'] if part['fs_bytes'] > part['bytes']: - raise InvalidLayout('Filesystem may not be larger than partition') + raise InvalidLayout( + 'Filesystem may not be larger than partition: %s %s: %d > %d' % + (layout_name, part['label'], part['fs_bytes'], part['bytes'])) except KeyError as e: raise InvalidLayout('Layout is missing required entries: %s' % e) diff --git a/build_library/legacy_disk_layout.json b/build_library/legacy_disk_layout.json index 78b7bea5fe..ccd6291909 100644 --- a/build_library/legacy_disk_layout.json +++ b/build_library/legacy_disk_layout.json @@ -80,14 +80,14 @@ "label":"ROOT-B", "type":"rootfs", "blocks":"4194304", - "fs_blocks":"217600" + "fs_blocks":"262144" }, { "num": 3, "label":"ROOT-A", "type":"rootfs", "blocks":"4194304", - "fs_blocks":"217600" + "fs_blocks":"262144" } ], "usb": [ @@ -95,8 +95,8 @@ "num": 3, "label":"ROOT-A", "type":"rootfs", - "blocks":"1757184", - "fs_blocks":"217600" + "blocks":"2113672", + "fs_blocks":"262144" }, { "num": 5, @@ -143,15 +143,15 @@ "num": 3, "label":"ROOT-A", "type":"rootfs", - "blocks":"2097152", - "fs_blocks":"217600" + "blocks":"2113672", + "fs_blocks":"262144" }, { "num": 5, "label":"ROOT-B", "type":"rootfs", - "blocks":"2097152", - "fs_blocks":"217600" + "blocks":"2113672", + "fs_blocks":"262144" } ], "recovery": [ @@ -165,8 +165,8 @@ "num": 3, "label":"ROOT-A", "type":"rootfs", - "blocks":"1757184", - "fs_blocks":"217600" + "blocks":"2113672", + "fs_blocks":"262144" }, { "num": 5,