projects
/
project
/
ubox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
aacfc57
)
block: support extroot and overlay mounts by device
author
Jo-Philipp Wich
<jow@openwrt.org>
Wed, 6 Nov 2013 12:54:16 +0000
(12:54 +0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Thu, 7 Nov 2013 17:03:02 +0000
(17:03 +0000)
block.c
patch
|
blob
|
history
diff --git
a/block.c
b/block.c
index
aa37e24
..
74e4d96
100644
(file)
--- a/
block.c
+++ b/
block.c
@@
-525,7
+525,7
@@
static struct blkid_struct_probe* find_block_info(char *uuid, char *label, char
if (path)
list_for_each_entry(pr, &devices, list)
if (path)
list_for_each_entry(pr, &devices, list)
- if (!strcmp(
pr->dev, path
))
+ if (!strcmp(
basename(pr->dev), basename(path)
))
return pr;
return NULL;
return pr;
return NULL;
@@
-872,14
+872,14
@@
static int mount_extroot(char *cfg)
if (!m || !m->extroot)
return -1;
if (!m || !m->extroot)
return -1;
- pr = find_block_info(m->uuid, m->label,
NULL
);
+ pr = find_block_info(m->uuid, m->label,
m->device
);
if (!pr && delay_root){
fprintf(stderr, "extroot: is not ready yet, retrying in %u seconds\n", delay_root);
sleep(delay_root);
mkblkdev();
cache_load(0);
if (!pr && delay_root){
fprintf(stderr, "extroot: is not ready yet, retrying in %u seconds\n", delay_root);
sleep(delay_root);
mkblkdev();
cache_load(0);
- pr = find_block_info(m->uuid, m->label,
NULL
);
+ pr = find_block_info(m->uuid, m->label,
m->device
);
}
if (pr) {
if (strncmp(pr->id->name, "ext", 3)) {
}
if (pr) {
if (strncmp(pr->id->name, "ext", 3)) {