lakitu: Update comments in disk_layout.json
Remove deprecated comments in disk_layout.json, which
is misleading.
BUG=b/186123358
TEST=presbumit
RELEASE_NOTE=None
Change-Id: Id5f3b19529895ecbd5bdd0e9a4bd514468fdefd4
Reviewed-on: https://cos-review.googlesource.com/c/cos/overlays/board-overlays/+/15893
Tested-by: Roy Yang <royyang@google.com>
Reviewed-by: Robert Kolchmeyer <rkolchmeyer@google.com>
diff --git a/project-lakitu/scripts/disk_layout.json b/project-lakitu/scripts/disk_layout.json
index 7492dd3..1c01ecb 100644
--- a/project-lakitu/scripts/disk_layout.json
+++ b/project-lakitu/scripts/disk_layout.json
@@ -14,16 +14,29 @@
# Partitions are expected to be aligned to 4096 block boundary,
# that is, 2 MiB.
#
- # Starting with crrev.com/c/528047, 1GiB will always be added
- # to the stateful partition size. Therefore, we leave room
- # for it in the computation below to prevent the image size
- # growing beyond 10GiB.
- #
# number of 512-byte sectors in 10GiB: 20,971,520
# stateful partition starting sector: 8,704,000 (cgpt show /dev/sda)
# stateful partition size in MiB: 5,990 (2MiB aligned)
- # stateful partition size less 1GiB in MiB: 4,966 (crrev.com/c/528047)
- "common": [
+ # stateful partition size less 1GiB in MiB: 4,966
+ #
+ # NOTEs:
+ # image_type and disk_layout are different. Only disk_layout is used for controlling
+ # the size of partitions.
+ #
+ # Both base and test image will use usb disk_layout by default. To use base disk_layout,
+ # we need to specify `--disk_layout=base`. This is what COS builder used.
+ #
+ # Both base and test image's size will be 8GiB without specifying disk_layout.
+ # disk_layout is usb by default. The size of the image is the sum
+ # of ROOT-A(2GiB)+ROOT-B(2MiB)+Stateful Partition(~5GiB). ROOT-B's size is specified
+ # in the usb section of legacy_disk_layout.json
+ #
+ # Both base and test image's size will be 9GiB by COS builder, which will use base
+ # disk_layout. The size is sum of ROOT-A(2GiB)+ROOT-B(2GiB)+Stateful Parition(~5B).
+ #
+ # We never have a 10GiB size of image in practice. When create VM on GCE, the default
+ # image size is 10GiB.
+ "common": [
{
# STATE
"num": 1,