mirrors/abootimg
1
0
Fork 0
mirror of https://github.com/ggrandou/abootimg.git synced 2024-11-23 09:53:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix when udpating ramdisk without kernel

Browse Source
This commit is contained in:
Gilles Grandou 2010-11-28 22:42:39 +01:00
parent 6cf7c45b2a
commit e1a2d45d5a
1 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
abootimg.c
View File

@ -576,6 +576,12 @@ void write_bootimg(t_abootimg* img)
if (!padding) if (!padding)
abort_perror(""); abort_perror("");
unsigned n = (img->header.kernel_size + psize - 1) / psize;
unsigned m = (img->header.ramdisk_size + psize - 1) / psize;
unsigned o = (img->header.second_size + psize - 1) / psize;
unsigned total_pages = 1+n+m+o;
unsigned bootimg_pages = img->size/psize;
if (fseek(img->stream, 0, SEEK_SET)) if (fseek(img->stream, 0, SEEK_SET))
abort_perror(img->fname); abort_perror(img->fname);
@ -588,23 +594,32 @@ void write_bootimg(t_abootimg* img)
abort_perror(img->fname); abort_perror(img->fname);
if (img->kernel) { if (img->kernel) {
fwrite(img->kernel, 1, img->header.kernel_size, img->stream); fwrite(img->kernel, 1, img->header.kernel_size, img->stream);
if (ferror(img->stream)) if (ferror(img->stream))
abort_perror(img->fname); abort_perror(img->fname);
fwrite(padding, 1, psize - (img->header.kernel_size % psize), img->stream); fwrite(padding, 1, psize - (img->header.kernel_size % psize), img->stream);
if (ferror(img->stream)) if (ferror(img->stream))
abort_perror(img->fname); abort_perror(img->fname);
}
fwrite(img->ramdisk, 1, img->header.ramdisk_size, img->stream); if (img->ramdisk) {
if (ferror(img->stream)) if (fseek(img->stream, (1+n)*psize, SEEK_SET))
abort_perror(img->fname); abort_perror(img->fname);
fwrite(padding, 1, psize - (img->header.ramdisk_size % psize), img->stream); fwrite(img->ramdisk, 1, img->header.ramdisk_size, img->stream);
if (ferror(img->stream)) if (ferror(img->stream))
abort_perror(img->fname); abort_perror(img->fname);
fwrite(padding, 1, psize - (img->header.ramdisk_size % psize), img->stream);
if (ferror(img->stream))
abort_perror(img->fname);
}
if (img->header.second_size) { if (img->header.second_size) {
if (fseek(img->stream, (1+n+m)*psize, SEEK_SET))
abort_perror(img->fname);
fwrite(img->second, 1, img->header.second_size, img->stream); fwrite(img->second, 1, img->header.second_size, img->stream);
if (ferror(img->stream)) if (ferror(img->stream))
abort_perror(img->fname); abort_perror(img->fname);
@ -613,13 +628,6 @@ void write_bootimg(t_abootimg* img)
if (ferror(img->stream)) if (ferror(img->stream))
abort_perror(img->fname); abort_perror(img->fname);
} }
}
unsigned n = (img->header.kernel_size + psize - 1) / psize;
unsigned m = (img->header.ramdisk_size + psize - 1) / psize;
unsigned o = (img->header.second_size + psize - 1) / psize;
unsigned total_pages = 1+n+m+o;
unsigned bootimg_pages = img->size/psize;
ftruncate (fileno(img->stream), img->size); ftruncate (fileno(img->stream), img->size);