}
static int
-jffs2_mount(void)
+jffs2_mount(struct volume *v)
{
- struct volume *v;
-
if (mkdir("/tmp/overlay", 0755)) {
fprintf(stderr, "failed to mkdir /tmp/overlay: %s\n", strerror(errno));
return -1;
}
- v = volume_find("rootfs_data");
- if (!v) {
- fprintf(stderr, "rootfs_data does not exist\n");
- return -1;
- }
-
if (mount(v->blk, "/tmp/overlay", "jffs2", MS_NOATIME, NULL)) {
fprintf(stderr, "failed to mount -t jffs2 %s /tmp/overlay: %s\n", v->blk, strerror(errno));
return -1;
}
static int
-switch2jffs(void)
+switch2jffs(struct volume *v)
{
- struct volume *v = volume_find("rootfs_data");
struct stat s;
int ret;
return -1;
}
- if (!v) {
- fprintf(stderr, "no rootfs_data was found\n");
- return -1;
- }
-
creat("/tmp/.switch_jffs2", 0600);
ret = mount(v->blk, "/rom/overlay", "jffs2", MS_NOATIME, NULL);
unlink("/tmp/.switch_jffs2");
}
int
-jffs2_switch(int argc, char **argv)
+jffs2_switch(struct volume *v)
{
- struct volume *v;
char *mp;
int ret = -1;
return ret;
}
- v = volume_find("rootfs_data");
mp = find_mount_point(v->blk, 0);
if (mp) {
fprintf(stderr, "rootfs_data:%s is already mounted as %s\n", v->blk, mp);
/* fall through */
case FS_DEADCODE:
- ret = switch2jffs();
+ ret = switch2jffs(v);
if (!ret) {
fprintf(stderr, "doing fo cleanup\n");
umount2("/tmp/root", MNT_DETACH);
break;
case FS_JFFS2:
- ret = jffs2_mount();
+ ret = jffs2_mount(v);
if (ret)
break;
if (mount_move("/tmp", "", "/overlay") || fopivot("/overlay", "/rom")) {
return ret;
}
-static int mount_overlay_fs(void)
+static int mount_overlay_fs(struct volume *v)
{
- struct volume *v;
-
if (mkdir("/tmp/overlay", 0755)) {
fprintf(stderr, "failed to mkdir /tmp/overlay: %s\n", strerror(errno));
return -1;
}
- v = volume_find("rootfs_data");
- if (!v) {
- fprintf(stderr, "rootfs_data does not exist\n");
- return -1;
- }
-
if (mount(v->blk, "/tmp/overlay", "jffs2", MS_NOATIME, NULL)) {
fprintf(stderr, "failed to mount -t jffs2 %s /tmp/overlay: %s\n",
v->blk, strerror(errno));
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;
-
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;
}
- mount_overlay_fs();
+ mount_overlay_fs(v);
extroot_prefix = "/tmp/overlay";
if (!mount_extroot()) {