projects
/
project
/
fstools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libfstools: accept volume as argument in most calls
[project/fstools.git]
/
libfstools
/
overlay.c
diff --git
a/libfstools/overlay.c
b/libfstools/overlay.c
index
e3ee7ae
..
9e830a1
100644
(file)
--- a/
libfstools/overlay.c
+++ b/
libfstools/overlay.c
@@
-143,9
+143,8
@@
handle_whiteout(const char *dir)
}
int
}
int
-jffs2_switch(
int argc, char **arg
v)
+jffs2_switch(
struct volume *
v)
{
{
- struct volume *v;
char *mp;
int ret = -1;
char *mp;
int ret = -1;
@@
-157,8
+156,7
@@
jffs2_switch(int argc, char **argv)
return ret;
}
return ret;
}
- v = volume_find("rootfs_data");
- mp = find_mount_point(v->blk, NULL);
+ mp = find_mount_point(v->blk, 0);
if (mp) {
fprintf(stderr, "rootfs_data:%s is already mounted as %s\n", v->blk, mp);
return -1;
if (mp) {
fprintf(stderr, "rootfs_data:%s is already mounted as %s\n", v->blk, mp);
return -1;
@@
-192,7
+190,7
@@
jffs2_switch(int argc, char **argv)
ret = overlay_mount(v, "ubifs");
if (ret)
break;
ret = overlay_mount(v, "ubifs");
if (ret)
break;
-
if (mount_move("/tmp", "", "/overlay") || fopivot("/overlay", "/rom")) {
+ if (mount_move("/tmp", "", "/overlay") || fopivot("/overlay", "/rom")) {
fprintf(stderr, "switching to ubifs failed\n");
ret = -1;
}
fprintf(stderr, "switching to ubifs failed\n");
ret = -1;
}
@@
-201,9
+199,8
@@
jffs2_switch(int argc, char **argv)
return ret;
}
return ret;
}
-static int overlay_mount_fs(
void
)
+static int overlay_mount_fs(
struct volume *v
)
{
{
- struct volume *v;
char *fstype;
if (mkdir("/tmp/overlay", 0755)) {
char *fstype;
if (mkdir("/tmp/overlay", 0755)) {
@@
-211,12
+208,6
@@
static int overlay_mount_fs(void)
return -1;
}
return -1;
}
- v = volume_find("rootfs_data");
- if (!v) {
- fprintf(stderr, "rootfs_data does not exist\n");
- return -1;
- }
-
fstype = "jffs2";
switch (volume_identify(v)) {
fstype = "jffs2";
switch (volume_identify(v)) {
@@
-236,21
+227,20
@@
static int overlay_mount_fs(void)
return -1;
}
return -1;
}
-int mount_overlay(
void
)
+int mount_overlay(
struct volume *v
)
{
{
- struct volume *v = volume_find("rootfs_data");;
char *mp;
if (!v)
return -1;
char *mp;
if (!v)
return -1;
- mp = find_mount_point(v->blk,
NULL
);
+ mp = find_mount_point(v->blk,
0
);
if (mp) {
fprintf(stderr, "rootfs_data:%s is already mounted as %s\n", v->blk, mp);
return -1;
}
if (mp) {
fprintf(stderr, "rootfs_data:%s is already mounted as %s\n", v->blk, mp);
return -1;
}
- overlay_mount_fs();
+ overlay_mount_fs(
v
);
extroot_prefix = "/tmp/overlay";
if (!mount_extroot()) {
extroot_prefix = "/tmp/overlay";
if (!mount_extroot()) {