mirrors/genimage
0
0
Fork 0
mirror of https://github.com/pengutronix/genimage.git synced 2024-11-23 09:43:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #72 from michaelolbrich/gpt-secondary

Browse Source 
image-hd: the secondary GPT header should point to the secondary GPT table
This commit is contained in:
Michael Olbrich 2019-09-21 07:16:51 +00:00 committed by GitHub
commit 3300b46aeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
image-hd.c
View File

@ -308,6 +308,7 @@ static int hdimage_insert_gpt(struct image *image, struct list_head *partitions)
header.header_crc = 0;
header.current_lba = htole64(image->size/512 - 1);
header.backup_lba = htole64(1);
header.starting_lba = htole64(image->size/512 - GPT_SECTORS);
header.header_crc = htole32(crc32(&header, sizeof(header)));
ret = insert_data(image, (char *)&table, outfile, sizeof(table),
image->size - GPT_SECTORS*512);

10
test/basic-images.test
View File

@ -89,6 +89,14 @@ check_size() {
fi
}
sfdisk_validate() {
if [ -n "$(sfdisk -q -V "${1}" 2>&1 | grep -v unallocated)" ]; then
echo "'sfdisk -V' failed with:"
sfdisk -V "${1}" 2>&1
return 1
fi
}
exec_test_set_prereq() {
command -v "${1}" > /dev/null && test_set_prereq "${1/./_}"
}
@ -199,6 +207,7 @@ test_expect_success fdisk,sfdisk "hdimage" "
setup_test_images &&
run_genimage hdimage.config test.hdimage &&
check_size images/test.hdimage 10485760 &&
sfdisk_validate images/test.hdimage &&
# check the this identifier
fdisk -l images/test.hdimage | grep identifier: > hdimage.fdisk &&
# check partitions; filter output to handle different sfdisk versions
@ -225,6 +234,7 @@ test_expect_success fdisk-gpt,sfdisk-gpt "hdimage4" "
setup_test_images &&
run_genimage hdimage4.config test.hdimage &&
check_size images/test.hdimage 7356928 &&
sfdisk_validate images/test.hdimage &&
# check the this identifier
fdisk -l images/test.hdimage | grep identifier: > hdimage4.fdisk &&
# check partitions; filter output to handle different sfdisk versions