openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mkbootfs: Fix the default st_mode for root directory. 

CL in [1] fixed the wrong mode for the root directory from 0644 to 0755.
However it only handles the path by calling mkbootfs with canned
fs_config (i.e. with -f flag). When calling mkbootfs without -f flag, it
still treats the root directory as a file. This renders the generated
boot/recovery images w/ and w/o -f being different, and leads to the
incorrect checksums in /system/bin/install-recovery.sh.

[1] commit aa8f2f65a030f71506277e2a8d64d83a099e9feb.

Bug: 31988535
Test: `make dist` and verify the checksums in /system/bin/install-recovery.sh.

Change-Id: Ib50fadb23367da0b46944ae0579093da21412593
This commit is contained in:
Tao Bao 2016-10-07 10:20:52 -07:00
parent 8caf4e7443
commit 3b5fbd8331
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cpio/mkbootfs.c
View File

@ -51,6 +51,8 @@ static char *target_out_path = NULL;
#define CANNED_LINE_LENGTH (1024)
#endif
#define TRAILER "TRAILER!!!"
static int verbose = 0;
static int total_size = 0;
@ -80,8 +82,8 @@ static void fix_stat(const char *path, struct stat *s)
} else {
// Use the compiled-in fs_config() function.
unsigned st_mode = s->st_mode;
fs_config(path, S_ISDIR(s->st_mode), target_out_path,
&s->st_uid, &s->st_gid, &st_mode, &capabilities);
int is_dir = S_ISDIR(s->st_mode) || strcmp(path, TRAILER) == 0;
fs_config(path, is_dir, target_out_path, &s->st_uid, &s->st_gid, &st_mode, &capabilities);
s->st_mode = (typeof(s->st_mode)) st_mode;
}
}
@ -140,7 +142,7 @@ static void _eject_trailer()
{
struct stat s;
memset(&s, 0, sizeof(s));
_eject(&s, "TRAILER!!!", 10, 0, 0);
_eject(&s, TRAILER, 10, 0, 0);
while(total_size & 0xff) {
total_size++;