Add another mount function that takes a list of fstypes to try.

2 files changed, 20 insertions, 0 deletions

diff --git a/isys/imount.c b/isys/imount.c
index f789f5be2..9ae5e6d3d 100644
--- a/isys/imount.c
+++ b/isys/imount.c
@@ -130,6 +130,25 @@ int doPwMount(char *dev, char *where, char *fs, char *options, char **err) {
     return 0;
 }
 
+int doMultiMount(char *dev, char *where, char **fstypes, char *options, char **err) {
+    int retval = 0, i;
+
+    for (i = 0; fstypes[i]; i++) {
+        /* If we made a previous call to mount and it returned an error message,
+         * get rid of it now.  We only want to preserve the error from the last
+         * fstype.
+         */
+        if (err && *err)
+            free(*err);
+
+        retval = doPwMount(dev, where, fstypes[i], options, err);
+        if (!retval)
+            return retval;
+    }
+
+    return retval;
+}
+
 int mkdirChain(char * origChain) {
     char * chain;
     char * chptr;
diff --git a/isys/imount.h b/isys/imount.h
index 9f9c4251c..56f6deaf3 100644
--- a/isys/imount.h
+++ b/isys/imount.h
@@ -30,6 +30,7 @@
 #define IMOUNT_REMOUNT 4
 
 int doPwMount(char *dev, char *where, char *fs, char *options, char **err);
+int doMultiMount(char *dev, char *where, char **fstypes, char *options, char **err);
 int mkdirChain(char * origChain);
 
 #endif