From a022642e5493d6ad869a73b2b8edff49efc02b1e Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 5 Mar 2014 15:57:22 -0800 Subject: [PATCH] rename(disk_layout): Remove the legacy use of "legacy" --- build_library/{legacy_disk_layout.json => disk_layout.json} | 0 build_library/disk_util | 2 +- build_library/vm_image_util.sh | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename build_library/{legacy_disk_layout.json => disk_layout.json} (100%) diff --git a/build_library/legacy_disk_layout.json b/build_library/disk_layout.json similarity index 100% rename from build_library/legacy_disk_layout.json rename to build_library/disk_layout.json diff --git a/build_library/disk_util b/build_library/disk_util index 916ea695d7..e3751ed54f 100755 --- a/build_library/disk_util +++ b/build_library/disk_util @@ -765,7 +765,7 @@ def DoParseOnly(options): def main(argv): default_layout_file = os.environ.get('DISK_LAYOUT_FILE', - os.path.join(os.path.dirname(__file__), 'legacy_disk_layout.json')) + os.path.join(os.path.dirname(__file__), 'disk_layout.json')) default_layout_type = os.environ.get('DISK_LAYOUT_TYPE', 'base') parser = argparse.ArgumentParser( diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh index b22294457d..1f58ec98ab 100644 --- a/build_library/vm_image_util.sh +++ b/build_library/vm_image_util.sh @@ -50,7 +50,7 @@ IMG_DEFAULT_OEM_PACKAGE= # May be raw, qcow2 (qemu), or vmdk (vmware, virtualbox) IMG_DEFAULT_DISK_FORMAT=raw -# Name of the partition layout from legacy_disk_layout.json +# Name of the partition layout from disk_layout.json IMG_DEFAULT_DISK_LAYOUT=base # Name of the target config format, default is no config