block: simplify code picking mount target directory

[project/fstools.git] / block.c

diff --git a/block.c b/block.c
index d7a9c5fc9583d8e4b5fda2a4a1c842e36c7f4308..0671aca6d0f8231ba9f790859b513ffd75735929 100644 (file)
--- a/block.c
+++ b/block.c
@@ -529,6 +529,7 @@ static void cache_load(int mtd)
        _cache_load("/dev/sd*");
        _cache_load("/dev/hd*");
        _cache_load("/dev/md*");
+       _cache_load("/dev/nvme*");
        _cache_load("/dev/vd*");
        _cache_load("/dev/xvd*");
        _cache_load("/dev/mapper/*");
@@ -710,6 +711,7 @@ static void check_filesystem(struct probe_info *pr)
        const char *f2fsck = "/usr/sbin/fsck.f2fs";
        const char *dosfsck = "/usr/sbin/dosfsck";
        const char *btrfsck = "/usr/bin/btrfsck";
+       const char *ntfsck = "/usr/bin/ntfsfix";
        const char *ckfs;
 
        /* UBIFS does not need stuff like fsck */
@@ -724,6 +726,8 @@ static void check_filesystem(struct probe_info *pr)
                ckfs = e2fsck;
        } else if (!strncmp(pr->type, "btrfs", 5)) {
                ckfs = btrfsck;
+       } else if (!strncmp(pr->type, "ntfs", 4)) {
+               ckfs = ntfsck;
        } else {
                ULOG_ERR("check_filesystem: %s is not supported\n", pr->type);
                return;
@@ -738,20 +742,25 @@ static void check_filesystem(struct probe_info *pr)
        if (!pid) {
                if(!strncmp(pr->type, "f2fs", 4)) {
                        execl(ckfs, ckfs, "-f", pr->dev, NULL);
-                       exit(-1);
+                       exit(EXIT_FAILURE);
                } else if(!strncmp(pr->type, "btrfs", 5)) {
                        execl(ckfs, ckfs, "--repair", pr->dev, NULL);
-                       exit(-1);
+                       exit(EXIT_FAILURE);
+               } else if(!strncmp(pr->type, "ntfs", 4)) {
+                       execl(ckfs, ckfs, "-b", pr->dev, NULL);
+                       exit(EXIT_FAILURE);
                } else {
                        execl(ckfs, ckfs, "-p", pr->dev, NULL);
-                       exit(-1);
+                       exit(EXIT_FAILURE);
                }
        } else if (pid > 0) {
                int status;
 
                waitpid(pid, &status, 0);
-               if (WEXITSTATUS(status))
+               if (WIFEXITED(status) && WEXITSTATUS(status))
                        ULOG_ERR("check_filesystem: %s returned %d\n", ckfs, WEXITSTATUS(status));
+               if (WIFSIGNALED(status))
+                       ULOG_ERR("check_filesystem: %s terminated by %s\n", ckfs, strsignal(WTERMSIG(status)));
        }
 }
 
@@ -1012,36 +1021,37 @@ static int mount_device(struct probe_info *pr, int type)
        if (m && m->extroot)
                return -1;
 
-       if (m) switch (type) {
-       case TYPE_HOTPLUG:
+       if (type == 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];
+               char *target;
                int err = 0;
 
+               switch (type) {
+               case TYPE_HOTPLUG:
+                       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;
+               }
+
                if (m->autofs) {
                        snprintf(_target, sizeof(_target), "/tmp/run/blockd/%s", device);
                        target = _target;
-               }
-               if (!target) {
+               } else if (m->target) {
+                       target = m->target;
+               } else {
                        snprintf(_target, sizeof(_target), "/mnt/%s", device);
                        target = _target;
                }
@@ -1052,8 +1062,8 @@ static int mount_device(struct probe_info *pr, int type)
 
                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;
@@ -1071,8 +1081,8 @@ static int mount_device(struct probe_info *pr, int type)
 
                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;
@@ -1104,8 +1114,8 @@ static int umount_device(struct probe_info *pr)
 
        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);
@@ -1134,8 +1144,8 @@ static int mount_action(char *action, char *device, int type)
                        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;
@@ -1360,8 +1370,8 @@ static int check_extroot(char *path)
                        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;
                                }
@@ -1372,14 +1382,14 @@ static int check_extroot(char *path)
 
                        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))
-                               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))
@@ -1436,8 +1446,9 @@ static int mount_extroot(char *cfg)
                if (strncmp(pr->type, "ext", 3) &&
                    strncmp(pr->type, "f2fs", 4) &&
                    strncmp(pr->type, "btrfs", 5) &&
+                   strncmp(pr->type, "ntfs", 4) &&
                    strncmp(pr->type, "ubifs", 5)) {
-                       ULOG_ERR("extroot: unsupported filesystem %s, try ext4, f2fs, btrfs or ubifs\n", pr->type);
+                       ULOG_ERR("extroot: unsupported filesystem %s, try ext4, f2fs, btrfs, ntfs or ubifs\n", pr->type);
                        return -1;
                }
 
@@ -1457,8 +1468,8 @@ static int mount_extroot(char *cfg)
                            (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)