qi-hardware/xburst-tools
1
0
Fork 0
mirror of git://projects.qi-hardware.com/xburst-tools.git synced 2024-11-30 00:34:05 +02:00
Code

qi-clean-fail-partition-on-mount-fail.patch

Browse Source 
Failure to mount the filesystem makes us give up on the whole partition
the moment it happens

Signed-off-by: Andy Green <andy@openmoko.com>
This commit is contained in:
Andy Green 2008-12-01 01:26:06 +00:00 committed by Andy Green
parent 710f2dbb6e
commit 513fb7d0fc
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qiboot/src/phase2.c
View File

@ -59,7 +59,7 @@ int read_file(const char * filepath, u8 * destination, int size)
if (!ext2fs_mount()) { if (!ext2fs_mount()) {
puts("Unable to mount ext2 filesystem\n"); puts("Unable to mount ext2 filesystem\n");
indicate(UI_IND_MOUNT_FAIL); indicate(UI_IND_MOUNT_FAIL);
return -1; return -2; /* death */
} }
puts(" EXT2 open: "); puts(" EXT2 open: ");
puts(filepath); puts(filepath);
@ -104,6 +104,7 @@ void bootloader_second_phase(void)
(this_board->get_board_variant)(); (this_board->get_board_variant)();
unsigned int initramfs_len = 0; unsigned int initramfs_len = 0;
static char commandline_rootfs_append[512] = ""; static char commandline_rootfs_append[512] = "";
int ret;
/* we try the possible kernels for this board in order */ /* we try the possible kernels for this board in order */
@ -189,12 +190,16 @@ void bootloader_second_phase(void)
/* does he want us to skip this? */ /* does he want us to skip this? */
if (read_file(this_board->noboot, kernel_dram, 512) >= 0) { ret = read_file(this_board->noboot, kernel_dram, 512);
if (ret != -1) {
/* -2 (mount fail) should make us give up too */
if (ret >= 0) {
puts(" (Skipping on finding "); puts(" (Skipping on finding ");
puts(this_board->noboot); puts(this_board->noboot);
puts(")\n"); puts(")\n");
this_kernel = &this_board->kernel_source[kernel++];
indicate(UI_IND_SKIPPING); indicate(UI_IND_SKIPPING);
}
this_kernel = &this_board->kernel_source[kernel++];
continue; continue;
} }