libfstools: move mount points when switching to JFFS2

[project/fstools.git] / block.c

diff --git a/block.c b/block.c
index 05f84aa..b377429 100644 (file)
--- a/block.c
+++ b/block.c
@@ -31,6 +31,7 @@
 #include <sys/swap.h>
 #include <sys/mount.h>
 #include <sys/wait.h>
 #include <sys/swap.h>
 #include <sys/mount.h>
 #include <sys/wait.h>

+#include <sys/sysmacros.h>

 
 #include <linux/fs.h>
 
 
 #include <linux/fs.h>
 


@@ -42,9 +43,12 @@
 #include <libubox/vlist.h>
 #include <libubox/blobmsg_json.h>
 #include <libubox/avl-cmp.h>
 #include <libubox/vlist.h>
 #include <libubox/blobmsg_json.h>
 #include <libubox/avl-cmp.h>

+#include <libubus.h>

 
 #include "probe.h"
 
 
 #include "probe.h"
 

+#define AUTOFS_MOUNT_PATH       "/tmp/run/blockd/"
+

 #ifdef UBIFS_EXTROOT
 #include "libubi/libubi.h"
 #endif
 #ifdef UBIFS_EXTROOT
 #include "libubi/libubi.h"
 #endif


@@ -54,6 +58,12 @@ enum {
        TYPE_SWAP,
 };
 
        TYPE_SWAP,
 };
 

+enum {
+       TYPE_DEV,
+       TYPE_HOTPLUG,
+       TYPE_AUTOFS,
+};
+

 struct mount {
        struct vlist_node node;
        int type;
 struct mount {
        struct vlist_node node;
        int type;


@@ -66,6 +76,7 @@ struct mount {
        char *label;
        char *device;
        int extroot;
        char *label;
        char *device;
        int extroot;

+       int autofs;

        int overlay;
        int disabled_fsck;
        unsigned int prio;
        int overlay;
        int disabled_fsck;
        unsigned int prio;


@@ -103,6 +114,7 @@ enum {
        MOUNT_TARGET,
        MOUNT_DEVICE,
        MOUNT_OPTIONS,
        MOUNT_TARGET,
        MOUNT_DEVICE,
        MOUNT_OPTIONS,

+       MOUNT_AUTOFS,

        __MOUNT_MAX
 };
 
        __MOUNT_MAX
 };
 


@@ -118,6 +130,7 @@ static const struct blobmsg_policy mount_policy[__MOUNT_MAX] = {
        [MOUNT_TARGET] = { .name = "target", .type = BLOBMSG_TYPE_STRING },
        [MOUNT_OPTIONS] = { .name = "options", .type = BLOBMSG_TYPE_STRING },
        [MOUNT_ENABLE] = { .name = "enabled", .type = BLOBMSG_TYPE_INT32 },
        [MOUNT_TARGET] = { .name = "target", .type = BLOBMSG_TYPE_STRING },
        [MOUNT_OPTIONS] = { .name = "options", .type = BLOBMSG_TYPE_STRING },
        [MOUNT_ENABLE] = { .name = "enabled", .type = BLOBMSG_TYPE_INT32 },

+       [MOUNT_AUTOFS] = { .name = "autofs", .type = BLOBMSG_TYPE_INT32 },

 };
 
 static const struct uci_blob_param_list mount_attr_list = {
 };
 
 static const struct uci_blob_param_list mount_attr_list = {


@@ -246,7 +259,7 @@ static int mount_add(struct uci_section *s)
        struct blob_attr *tb[__MOUNT_MAX] = { 0 };
        struct mount *m;
 
        struct blob_attr *tb[__MOUNT_MAX] = { 0 };
        struct mount *m;
 

-        blob_buf_init(&b, 0);
+       blob_buf_init(&b, 0);

        uci_to_blob(&b, s, &mount_attr_list);
        blobmsg_parse(mount_policy, __MOUNT_MAX, tb, blob_data(b.head), blob_len(b.head));
 
        uci_to_blob(&b, s, &mount_attr_list);
        blobmsg_parse(mount_policy, __MOUNT_MAX, tb, blob_data(b.head), blob_len(b.head));
 


@@ -262,7 +275,10 @@ static int mount_add(struct uci_section *s)
        m->label = blobmsg_get_strdup(tb[MOUNT_LABEL]);
        m->target = blobmsg_get_strdup(tb[MOUNT_TARGET]);
        m->device = blobmsg_get_basename(tb[MOUNT_DEVICE]);
        m->label = blobmsg_get_strdup(tb[MOUNT_LABEL]);
        m->target = blobmsg_get_strdup(tb[MOUNT_TARGET]);
        m->device = blobmsg_get_basename(tb[MOUNT_DEVICE]);

-
+       if (tb[MOUNT_AUTOFS])
+               m->autofs = blobmsg_get_u32(tb[MOUNT_AUTOFS]);
+       else
+               m->autofs = 0;

        parse_mount_options(m, blobmsg_get_strdup(tb[MOUNT_OPTIONS]));
 
        m->overlay = m->extroot = 0;
        parse_mount_options(m, blobmsg_get_strdup(tb[MOUNT_OPTIONS]));
 
        m->overlay = m->extroot = 0;


@@ -513,7 +529,9 @@ static void cache_load(int mtd)
        _cache_load("/dev/sd*");
        _cache_load("/dev/hd*");
        _cache_load("/dev/md*");
        _cache_load("/dev/sd*");
        _cache_load("/dev/hd*");
        _cache_load("/dev/md*");

+       _cache_load("/dev/nvme*");

        _cache_load("/dev/vd*");
        _cache_load("/dev/vd*");

+       _cache_load("/dev/xvd*");

        _cache_load("/dev/mapper/*");
 }
 
        _cache_load("/dev/mapper/*");
 }
 


@@ -692,6 +710,7 @@ static void check_filesystem(struct probe_info *pr)
        const char *e2fsck = "/usr/sbin/e2fsck";
        const char *f2fsck = "/usr/sbin/fsck.f2fs";
        const char *dosfsck = "/usr/sbin/dosfsck";
        const char *e2fsck = "/usr/sbin/e2fsck";
        const char *f2fsck = "/usr/sbin/fsck.f2fs";
        const char *dosfsck = "/usr/sbin/dosfsck";

+       const char *btrfsck = "/usr/bin/btrfsck";

        const char *ckfs;
 
        /* UBIFS does not need stuff like fsck */
        const char *ckfs;
 
        /* UBIFS does not need stuff like fsck */


@@ -704,6 +723,8 @@ static void check_filesystem(struct probe_info *pr)
                ckfs = f2fsck;
        } else if (!strncmp(pr->type, "ext", 3)) {
                ckfs = e2fsck;
                ckfs = f2fsck;
        } else if (!strncmp(pr->type, "ext", 3)) {
                ckfs = e2fsck;

+       } else if (!strncmp(pr->type, "btrfs", 5)) {
+               ckfs = btrfsck;

        } else {
                ULOG_ERR("check_filesystem: %s is not supported\n", pr->type);
                return;
        } else {
                ULOG_ERR("check_filesystem: %s is not supported\n", pr->type);
                return;


@@ -719,6 +740,9 @@ static void check_filesystem(struct probe_info *pr)
                if(!strncmp(pr->type, "f2fs", 4)) {
                        execl(ckfs, ckfs, "-f", pr->dev, NULL);
                        exit(-1);
                if(!strncmp(pr->type, "f2fs", 4)) {
                        execl(ckfs, ckfs, "-f", pr->dev, NULL);
                        exit(-1);

+               } else if(!strncmp(pr->type, "btrfs", 5)) {
+                       execl(ckfs, ckfs, "--repair", pr->dev, NULL);
+                       exit(-1);

                } else {
                        execl(ckfs, ckfs, "-p", pr->dev, NULL);
                        exit(-1);
                } else {
                        execl(ckfs, ckfs, "-p", pr->dev, NULL);
                        exit(-1);


@@ -899,7 +923,65 @@ static int handle_mount(const char *source, const char *target,
        return err;
 }
 
        return err;
 }
 

-static int mount_device(struct probe_info *pr, int hotplug)
+static void blockd_notify(char *device, struct mount *m, struct probe_info *pr)
+{
+       struct ubus_context *ctx = ubus_connect(NULL);
+       uint32_t id;
+
+       if (!ctx)
+               return;
+
+       if (!ubus_lookup_id(ctx, "block", &id)) {
+               struct blob_buf buf = { 0 };
+               char *d = strrchr(device, '/');
+
+               if (d)
+                       d++;
+               else
+                       d = device;
+
+               blob_buf_init(&buf, 0);
+
+               if (m) {
+
+                       blobmsg_add_string(&buf, "device", d);
+                       if (m->uuid)
+                               blobmsg_add_string(&buf, "uuid", m->uuid);
+                       if (m->label)
+                               blobmsg_add_string(&buf, "label", m->label);
+                       if (m->target)
+                               blobmsg_add_string(&buf, "target", m->target);
+                       if (m->options)
+                               blobmsg_add_string(&buf, "options", m->options);
+                       if (m->autofs)
+                               blobmsg_add_u32(&buf, "autofs", m->autofs);
+                       if (pr->type)
+                               blobmsg_add_string(&buf, "type", pr->type);
+                       if (pr->version)
+                               blobmsg_add_string(&buf, "version", pr->version);
+               } else if (pr) {
+                       blobmsg_add_string(&buf, "device", d);
+                       if (pr->uuid)
+                               blobmsg_add_string(&buf, "uuid", pr->uuid);
+                       if (pr->label)
+                               blobmsg_add_string(&buf, "label", pr->label);
+                       if (pr->type)
+                               blobmsg_add_string(&buf, "type", pr->type);
+                       if (pr->version)
+                               blobmsg_add_string(&buf, "version", pr->version);
+                       blobmsg_add_u32(&buf, "anon", 1);
+               } else {
+                       blobmsg_add_string(&buf, "device", d);
+                       blobmsg_add_u32(&buf, "remove", 1);
+               }
+
+               ubus_invoke(ctx, id, "hotplug", buf.head, NULL, NULL, 3000);
+       }
+
+       ubus_free(ctx);
+}
+
+static int mount_device(struct probe_info *pr, int type)

 {
        struct mount *m;
        char *device;
 {
        struct mount *m;
        char *device;


@@ -911,7 +993,7 @@ static int mount_device(struct probe_info *pr, int hotplug)
        device = basename(pr->dev);
 
        if (!strcmp(pr->type, "swap")) {
        device = basename(pr->dev);
 
        if (!strcmp(pr->type, "swap")) {

-               if (hotplug && !auto_swap)
+               if ((type == TYPE_HOTPLUG) && !auto_swap)

                        return -1;
                m = find_swap(pr->uuid, pr->label, device);
                if (m || anon_swap)
                        return -1;
                m = find_swap(pr->uuid, pr->label, device);
                if (m || anon_swap)


@@ -920,11 +1002,8 @@ static int mount_device(struct probe_info *pr, int hotplug)
                return 0;
        }
 
                return 0;
        }
 

-       if (hotplug && !auto_mount)
-               return -1;
-

        mp = find_mount_point(pr->dev);
        mp = find_mount_point(pr->dev);

-       if (mp) {
+       if (mp && (type != TYPE_HOTPLUG)) {

                ULOG_ERR("%s is already mounted on %s\n", pr->dev, mp);
                free(mp);
                return -1;
                ULOG_ERR("%s is already mounted on %s\n", pr->dev, mp);
                free(mp);
                return -1;


@@ -934,11 +1013,35 @@ static int mount_device(struct probe_info *pr, int hotplug)
        if (m && m->extroot)
                return -1;
 
        if (m && m->extroot)
                return -1;
 

+       if (m) switch (type) {
+       case TYPE_HOTPLUG:
+               blockd_notify(device, m, pr);
+               if (m->autofs)
+                       return 0;
+               if (!auto_mount)
+                       return -1;
+               break;
+       case TYPE_AUTOFS:
+               if (!m->autofs)
+                       return -1;
+               break;
+       case TYPE_DEV:
+               if (m->autofs)
+                       return -1;
+               break;
+       } else if (type == TYPE_HOTPLUG) {
+               blockd_notify(device, NULL, pr);
+       }
+

        if (m) {
                char *target = m->target;
                char _target[32];
                int err = 0;
 
        if (m) {
                char *target = m->target;
                char _target[32];
                int err = 0;
 

+               if (m->autofs) {
+                       snprintf(_target, sizeof(_target), "/tmp/run/blockd/%s", device);
+                       target = _target;
+               }

                if (!target) {
                        snprintf(_target, sizeof(_target), "/mnt/%s", device);
                        target = _target;
                if (!target) {
                        snprintf(_target, sizeof(_target), "/mnt/%s", device);
                        target = _target;


@@ -950,8 +1053,8 @@ static int mount_device(struct probe_info *pr, int hotplug)
 
                err = handle_mount(pr->dev, target, pr->type, m);
                if (err)
 
                err = handle_mount(pr->dev, target, pr->type, m);
                if (err)

-                       ULOG_ERR("mounting %s (%s) as %s failed (%d) - %s\n",
-                                pr->dev, pr->type, target, errno, strerror(errno));
+                       ULOG_ERR("mounting %s (%s) as %s failed (%d) - %m\n",
+                                pr->dev, pr->type, target, errno);

                else
                        handle_swapfiles(true);
                return err;
                else
                        handle_swapfiles(true);
                return err;


@@ -969,8 +1072,8 @@ static int mount_device(struct probe_info *pr, int hotplug)
 
                err = handle_mount(pr->dev, target, pr->type, NULL);
                if (err)
 
                err = handle_mount(pr->dev, target, pr->type, NULL);
                if (err)

-                       ULOG_ERR("mounting %s (%s) as %s failed (%d) - %s\n",
-                                pr->dev, pr->type, target, errno, strerror(errno));
+                       ULOG_ERR("mounting %s (%s) as %s failed (%d) - %m\n",
+                                pr->dev, pr->type, target, errno);

                else
                        handle_swapfiles(true);
                return err;
                else
                        handle_swapfiles(true);
                return err;


@@ -1002,8 +1105,8 @@ static int umount_device(struct probe_info *pr)
 
        err = umount2(mp, MNT_DETACH);
        if (err)
 
        err = umount2(mp, MNT_DETACH);
        if (err)

-               ULOG_ERR("unmounting %s (%s)  failed (%d) - %s\n",
-                        pr->dev, mp, errno, strerror(errno));
+               ULOG_ERR("unmounting %s (%s)  failed (%d) - %m\n",
+                        pr->dev, mp, errno);

        else
                ULOG_INFO("unmounted %s (%s)\n",
                          pr->dev, mp);
        else
                ULOG_INFO("unmounted %s (%s)\n",
                          pr->dev, mp);


@@ -1012,13 +1115,10 @@ static int umount_device(struct probe_info *pr)
        return err;
 }
 
        return err;
 }
 

-static int main_hotplug(int argc, char **argv)
+static int mount_action(char *action, char *device, int type)

 {
        char path[32];
 {
        char path[32];

-       char *action, *device, *mount_point;
-
-       action = getenv("ACTION");
-       device = getenv("DEVNAME");
+       char *mount_point;

 
        if (!action || !device)
                return -1;
 
        if (!action || !device)
                return -1;


@@ -1026,13 +1126,17 @@ static int main_hotplug(int argc, char **argv)
 
        if (!strcmp(action, "remove")) {
                int err = 0;
 
        if (!strcmp(action, "remove")) {
                int err = 0;

+
+               if (type == TYPE_HOTPLUG)
+                       blockd_notify(device, NULL, NULL);
+

                mount_point = find_mount_point(path);
                if (mount_point)
                        err = umount2(mount_point, MNT_DETACH);
 
                if (err)
                mount_point = find_mount_point(path);
                if (mount_point)
                        err = umount2(mount_point, MNT_DETACH);
 
                if (err)

-                       ULOG_ERR("umount of %s failed (%d) - %s\n",
-                                mount_point, errno, strerror(errno));
+                       ULOG_ERR("umount of %s failed (%d) - %m\n",
+                                mount_point, errno);

 
                free(mount_point);
                return 0;
 
                free(mount_point);
                return 0;


@@ -1046,7 +1150,37 @@ static int main_hotplug(int argc, char **argv)
                return -1;
        cache_load(0);
 
                return -1;
        cache_load(0);
 

-       return mount_device(find_block_info(NULL, NULL, path), 1);
+       return mount_device(find_block_info(NULL, NULL, path), type);
+}
+
+static int main_hotplug(int argc, char **argv)
+{
+       return mount_action(getenv("ACTION"), getenv("DEVNAME"), TYPE_HOTPLUG);
+}
+
+static int main_autofs(int argc, char **argv)
+{
+       if (argc < 3)
+               return -1;
+
+       if (!strcmp(argv[2], "start")) {
+               struct probe_info *pr;
+
+               if (config_load(NULL))
+                       return -1;
+
+               cache_load(0);
+               list_for_each_entry(pr, &devices, list) {
+                       struct mount *m = find_block(pr->uuid, pr->label, NULL, NULL);
+
+                       if (m && m->autofs)
+                               mount_device(pr, TYPE_HOTPLUG);
+                       else
+                               blockd_notify(pr->dev, m, pr);
+               }
+               return 0;
+       }
+       return mount_action(argv[2], argv[3], TYPE_AUTOFS);

 }
 
 static int find_block_mtd(char *name, char *part, int plen)
 }
 
 static int find_block_mtd(char *name, char *part, int plen)


@@ -1227,8 +1361,8 @@ static int check_extroot(char *path)
                        if (stat(tag, &s)) {
                                fp = fopen(tag, "w+");
                                if (!fp) {
                        if (stat(tag, &s)) {
                                fp = fopen(tag, "w+");
                                if (!fp) {

-                                       ULOG_ERR("extroot: failed to write UUID to %s: %d (%s)\n",
-                                                tag, errno, strerror(errno));
+                                       ULOG_ERR("extroot: failed to write UUID to %s: %d (%m)\n",
+                                                tag, errno);

                                        /* return 0 to continue boot regardless of error */
                                        return 0;
                                }
                                        /* return 0 to continue boot regardless of error */
                                        return 0;
                                }


@@ -1239,14 +1373,14 @@ static int check_extroot(char *path)
 
                        fp = fopen(tag, "r");
                        if (!fp) {
 
                        fp = fopen(tag, "r");
                        if (!fp) {

-                               ULOG_ERR("extroot: failed to read UUID from %s: %d (%s)\n",
-                                        tag, errno, strerror(errno));
+                               ULOG_ERR("extroot: failed to read UUID from %s: %d (%m)\n",
+                                        tag, errno);

                                return -1;
                        }
 
                        if (!fgets(uuid, sizeof(uuid), fp))
                                return -1;
                        }
 
                        if (!fgets(uuid, sizeof(uuid), fp))

-                               ULOG_ERR("extroot: failed to read UUID from %s: %d (%s)\n",
-                                        tag, errno, strerror(errno));
+                               ULOG_ERR("extroot: failed to read UUID from %s: %d (%m)\n",
+                                        tag, errno);

                        fclose(fp);
 
                        if (*uuid && !strcasecmp(uuid, pr->uuid))
                        fclose(fp);
 
                        if (*uuid && !strcasecmp(uuid, pr->uuid))


@@ -1302,8 +1436,9 @@ static int mount_extroot(char *cfg)
        if (pr) {
                if (strncmp(pr->type, "ext", 3) &&
                    strncmp(pr->type, "f2fs", 4) &&
        if (pr) {
                if (strncmp(pr->type, "ext", 3) &&
                    strncmp(pr->type, "f2fs", 4) &&

+                   strncmp(pr->type, "btrfs", 5) &&

                    strncmp(pr->type, "ubifs", 5)) {
                    strncmp(pr->type, "ubifs", 5)) {

-                       ULOG_ERR("extroot: unsupported filesystem %s, try ext4, f2fs or ubifs\n", pr->type);
+                       ULOG_ERR("extroot: unsupported filesystem %s, try ext4, f2fs, btrfs or ubifs\n", pr->type);

                        return -1;
                }
 
                        return -1;
                }
 


@@ -1323,8 +1458,8 @@ static int mount_extroot(char *cfg)
                            (m->options) ? (m->options) : (""));
 
                if (err) {
                            (m->options) ? (m->options) : (""));
 
                if (err) {

-                       ULOG_ERR("extroot: mounting %s (%s) on %s failed: %d (%s)\n",
-                                pr->dev, pr->type, path, errno, strerror(errno));
+                       ULOG_ERR("extroot: mounting %s (%s) on %s failed: %d (%m)\n",
+                                pr->dev, pr->type, path, errno);

                } else if (m->overlay) {
                        err = check_extroot(path);
                        if (err)
                } else if (m->overlay) {
                        err = check_extroot(path);
                        if (err)


@@ -1424,7 +1559,7 @@ static int main_mount(int argc, char **argv)
 
        cache_load(1);
        list_for_each_entry(pr, &devices, list)
 
        cache_load(1);
        list_for_each_entry(pr, &devices, list)

-               mount_device(pr, 0);
+               mount_device(pr, TYPE_DEV);

 
        handle_swapfiles(true);
 
 
        handle_swapfiles(true);
 


@@ -1644,6 +1779,9 @@ int main(int argc, char **argv)
                if (!strcmp(argv[1], "hotplug"))
                        return main_hotplug(argc, argv);
 
                if (!strcmp(argv[1], "hotplug"))
                        return main_hotplug(argc, argv);
 

+               if (!strcmp(argv[1], "autofs"))
+                       return main_autofs(argc, argv);
+

                if (!strcmp(argv[1], "extroot"))
                        return main_extroot(argc, argv);
 
                if (!strcmp(argv[1], "extroot"))
                        return main_extroot(argc, argv);