snapshot: md5sum return codes are not properly handled

[project/fstools.git] / block.c

diff --git a/block.c b/block.c
index a3db87b..ef58665 100644 (file)
--- a/block.c
+++ b/block.c
@@ -274,6 +274,13 @@ static int mount_add(struct uci_section *s)
        if (m->target && !strcmp(m->target, "/overlay"))
                m->extroot = m->overlay = 1;
 
+       if (m->target && *m->target != '/') {
+               ULOG_WARN("ignoring mount section %s due to invalid target '%s'\n",
+                         s->e.name, m->target);
+               free(m);
+               return -1;
+       }
+
        if (m->uuid)
                vlist_add(&mounts, &m->node, m->uuid);
        else if (m->label)
@@ -969,7 +976,7 @@ static int check_extroot(char *path)
        char devpath[32];
 
 #ifdef UBIFS_EXTROOT
-       if (find_block_mtd("rootfs", devpath, sizeof(devpath))) {
+       if (find_block_mtd("\"rootfs\"", devpath, sizeof(devpath))) {
                int err = -1;
                libubi_t libubi;
 
@@ -980,7 +987,7 @@ static int check_extroot(char *path)
                        return -1;
        }
 #else
-       if (find_block_mtd("rootfs", devpath, sizeof(devpath))) {
+       if (find_block_mtd("\"rootfs\"", devpath, sizeof(devpath))) {
                if (find_root_dev(devpath, sizeof(devpath))) {
                        ULOG_ERR("extroot: unable to determine root device\n");
                        return -1;
@@ -1094,7 +1101,8 @@ static int mount_extroot(char *cfg)
                if (check_fs)
                        check_filesystem(pr);
 
-               err = mount(pr->dev, path, pr->id->name, 0, (m->options) ? (m->options) : (""));
+               err = mount(pr->dev, path, pr->id->name, m->flags,
+                           (m->options) ? (m->options) : (""));
 
                if (err) {
                        ULOG_ERR("extroot: mounting %s (%s) on %s failed: %d (%s)\n",
@@ -1142,7 +1150,7 @@ static int main_extroot(int argc, char **argv)
         */
 
        /* Start with looking for MTD partition */
-       find_block_mtd("rootfs_data", blkdev_path, sizeof(blkdev_path));
+       find_block_mtd("\"rootfs_data\"", blkdev_path, sizeof(blkdev_path));
        if (blkdev_path[0]) {
                pr = find_block_info(NULL, NULL, blkdev_path);
                if (pr && !strcmp(pr->id->name, "jffs2")) {
@@ -1304,7 +1312,7 @@ static int main_swapon(int argc, char **argv)
                                return -1;
                        }
                        while (getline(&lineptr, &s, fp) > 0)
-                               printf(lineptr);
+                               printf("%s", lineptr);
                        if (lineptr)
                                free(lineptr);
                        fclose(fp);
@@ -1426,6 +1434,14 @@ int main(int argc, char **argv)
 
                if (!strcmp(argv[1], "umount"))
                        return main_umount(argc, argv);
+
+               if (!strcmp(argv[1], "remount")) {
+                       int ret = main_umount(argc, argv);
+
+                       if (!ret)
+                               ret = main_mount(argc, argv);
+                       return ret;
+               }
        }
 
        ULOG_ERR("Usage: block <info|mount|umount|detect>\n");