mkswap: do not do extra seek

mount: add another mount helper call method

1 files changed, 21 insertions, 0 deletions

diff --git a/util-linux/mount.c b/util-linux/mount.c
index 4ac52cd02..5e6c3ba72 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -309,6 +309,27 @@ static int mount_it_now(struct mntent *mp, int vfsflags, char *filteropts)
         for (;;) {
                 rc = mount(mp->mnt_fsname, mp->mnt_dir, mp->mnt_type,
                                 vfsflags, filteropts);
+
+                // If mount failed, try
+                // helper program <mnt_type>
+                if (ENABLE_FEATURE_MOUNT_HELPERS && rc) {
+                        char *args[6];
+                        int errno_save = errno;
+                        args[0] = mp->mnt_type;
+                        rc = 1;
+                        if (filteropts) {
+                                args[rc++] = (char *)"-o";
+                                args[rc++] = filteropts;
+                        }
+                        args[rc++] = mp->mnt_fsname;
+                        args[rc++] = mp->mnt_dir;
+                        args[rc] = NULL;
+                        rc = wait4pid(spawn(args));
+                        if (!rc)
+                                break;
+                        errno = errno_save;
+                }
+
                 if (!rc || (vfsflags & MS_RDONLY) || (errno != EACCES && errno != EROFS))
                         break;
                 if (!(vfsflags & MS_SILENT))