diff options
author | Hung-Te Lin <hungte@chromium.org> | 2019-03-22 11:05:30 +0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2019-10-09 13:31:10 +0000 |
commit | a60bf80726cc7255dcb3396c86c4fe9b26d0df32 (patch) | |
tree | bc5fc0753875a28d346b0f7e39bd1d81df07ac3f /cgpt | |
parent | df4d2000a22db673a788b8e57e8e7c0cc3cee777 (diff) | |
download | vboot-a60bf80726cc7255dcb3396c86c4fe9b26d0df32.tar.gz |
cgpt: Change stateful partition type GUID to TYPE_LINUX_FSstabilize-12593.Bfactory-kukui-12587.B
The TYPE_BASIC_DATA (called TYPE_LINUX_DATA before) is used by both
Windows and Linux systems, and has caused problems when dual-booting.
Modern Linux systems have been changed to TYPE_LINUX_FS.
In Chrome OS, we usually find the stateful partition by number (1)
instead of searching by type, so it should be fine simply replacing
default mapping in the cgpt tool.
BUG=chromium:944389
TEST=sudo emerge vboot_reference; make runtests
BRANCH=None
Change-Id: If18ff5180cbae5cdea8104f36203cffcf34db934
Signed-off-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1535456
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-by: Matt Delco <delco@google.com>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Diffstat (limited to 'cgpt')
-rw-r--r-- | cgpt/cgpt_common.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cgpt/cgpt_common.c b/cgpt/cgpt_common.c index e98a4533..04eab333 100644 --- a/cgpt/cgpt_common.c +++ b/cgpt/cgpt_common.c @@ -670,7 +670,8 @@ int UTF8ToUTF16(const uint8_t *utf8, uint16_t *utf16, unsigned int maxoutput) const Guid guid_chromeos_firmware = GPT_ENT_TYPE_CHROMEOS_FIRMWARE; const Guid guid_chromeos_kernel = GPT_ENT_TYPE_CHROMEOS_KERNEL; const Guid guid_chromeos_rootfs = GPT_ENT_TYPE_CHROMEOS_ROOTFS; -const Guid guid_linux_data = GPT_ENT_TYPE_LINUX_DATA; +const Guid guid_basic_data = GPT_ENT_TYPE_BASIC_DATA; +const Guid guid_linux_data = GPT_ENT_TYPE_LINUX_FS; const Guid guid_chromeos_reserved = GPT_ENT_TYPE_CHROMEOS_RESERVED; const Guid guid_efi = GPT_ENT_TYPE_EFI; const Guid guid_unused = GPT_ENT_TYPE_UNUSED; @@ -684,6 +685,7 @@ const static struct { {&guid_chromeos_kernel, "kernel", "ChromeOS kernel"}, {&guid_chromeos_rootfs, "rootfs", "ChromeOS rootfs"}, {&guid_linux_data, "data", "Linux data"}, + {&guid_basic_data, "basicdata", "Basic data"}, {&guid_chromeos_reserved, "reserved", "ChromeOS reserved"}, {&guid_efi, "efi", "EFI System Partition"}, {&guid_unused, "unused", "Unused (nonexistent) partition"}, |