Skip to content

abootimg: Improve compatability with no-initrd abootimg configs #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
johnstultz-work wants to merge 1 commit into
base: master
Choose a base branch
from
Open

abootimg: Improve compatability with no-initrd abootimg configs #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 19 additions & 13 deletions abootimg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ void print_usage(void)
"\n"
" bootimg has to be valid Android Boot Image, or the update will abort.\n"
"\n"
" abootimg --create <bootimg> [-c \"param=value\"] [-f <bootimg.cfg>] -k <kernel> -r <ramdisk> [-s <secondstage>]\n"
" abootimg --create <bootimg> [-c \"param=value\"] [-f <bootimg.cfg>] -k <kernel> [-r <ramdisk>] [-s <secondstage>]\n"
"\n"
" create a new image from scratch.\n"
" if the boot image file is a block device, sanity check will be performed to avoid overwriting a existing\n"
Expand Down Expand Up @@ -291,7 +291,11 @@ int check_boot_img_header(t_abootimg* img)

if (!(img->header.ramdisk_size)) {
fprintf(stderr, "%s: ramdisk size is null\n", img->fname);
return 1;
/*
* On newer AOSP devices, system can be used as rootfs,
* resulting in no initrd being used. Thus this case should
* not be fatal.
*/
}

unsigned page_size = img->header.page_size;
Expand Down Expand Up @@ -569,16 +573,18 @@ void update_images(t_abootimg *img)
else if (img->kernel) {
// if kernel is updated, copy the ramdisk from original image
char* r = malloc(rsize);
if (!r)
abort_perror("");
if (fseek(img->stream, roffset, SEEK_SET))
abort_perror(img->fname);
size_t rb = fread(r, rsize, 1, img->stream);
if ((rb!=1) || ferror(img->stream))
abort_perror(img->fname);
else if (feof(img->stream))
abort_printf("%s: cannot read ramdisk\n", img->fname);
img->ramdisk = r;
if (rsize != 0) {
if (!r)
abort_perror("");
if (fseek(img->stream, roffset, SEEK_SET))
abort_perror(img->fname);
size_t rb = fread(r, rsize, 1, img->stream);
if ((rb!=1) || ferror(img->stream))
abort_perror(img->fname);
else if (feof(img->stream))
abort_printf("%s: cannot read ramdisk\n", img->fname);
img->ramdisk = r;
}
}

if (img->second_fname) {
Expand Down Expand Up @@ -932,7 +938,7 @@ int main(int argc, char** argv)
break;

case create:
if (!bootimg->kernel_fname || !bootimg->ramdisk_fname) {
if (!bootimg->kernel_fname) {
print_usage();
break;
}
Expand Down