Revert mount -t auto to using /proc/filesystems, so we can

avoid automounting any nodev filesystems.
 -Erik

diff --git a/busybox/mount.c b/busybox/mount.c
index 2fc84f2c0f0481c52004f6cbe92ab746b407f849..af57a7623e2d3f1957dfbb191268a50fb2abfe98 100644 (file)
--- a/busybox/mount.c
+++ b/busybox/mount.c
@@ -240,6 +240,7 @@ mount_one(char *blockDevice, char *directory, char *filesystemType,
 {
        int status = 0;
 
+#if defined BB_FEATURE_USE_DEVPS_PATCH
        if (strcmp(filesystemType, "auto") == 0) {
                static const char *noauto_array[] = { "tmpfs", "shm", "proc", "ramfs", "devpts", "devfs", "usbdevfs", 0 };
                const char **noauto_fstype;
@@ -264,7 +265,35 @@ mount_one(char *blockDevice, char *directory, char *filesystemType,
                                        break;
                        }
                }
-       } else {
+       } 
+#else
+       if (strcmp(filesystemType, "auto") == 0) {
+               char buf[255];
+               FILE *f = xfopen("/proc/filesystems", "r");
+
+               while (fgets(buf, sizeof(buf), f) != NULL) {
+                       filesystemType = buf;
+                       if (*filesystemType == '\t') {  // Not a nodev filesystem
+
+                               // Add NULL termination to each line
+                               while (*filesystemType && *filesystemType != '\n')
+                                       filesystemType++;
+                               *filesystemType = '\0';
+
+                               filesystemType = buf;
+                               filesystemType++;       // hop past tab
+
+                               status = do_mount(blockDevice, directory, filesystemType,
+                                                                 flags | MS_MGC_VAL, string_flags,
+                                                                 useMtab, fakeIt, mtab_opts, mount_all);
+                               if (status == TRUE)
+                                       break;
+                       }
+               }
+               fclose(f);
+       }
+#endif
+       else {
                status = do_mount(blockDevice, directory, filesystemType,
                                flags | MS_MGC_VAL, string_flags, useMtab,
                                fakeIt, mtab_opts, mount_all);
@@ -279,7 +308,7 @@ mount_one(char *blockDevice, char *directory, char *filesystemType,
        return (TRUE);
 }
 
-void show_mounts()
+void show_mounts(void)
 {
 #if defined BB_FEATURE_USE_DEVPS_PATCH
        int fd, i, numfilesystems;

diff --git a/busybox/util-linux/mount.c b/busybox/util-linux/mount.c
index 2fc84f2c0f0481c52004f6cbe92ab746b407f849..af57a7623e2d3f1957dfbb191268a50fb2abfe98 100644 (file)
--- a/busybox/util-linux/mount.c
+++ b/busybox/util-linux/mount.c
@@ -240,6 +240,7 @@ mount_one(char *blockDevice, char *directory, char *filesystemType,
 {
        int status = 0;
 
+#if defined BB_FEATURE_USE_DEVPS_PATCH
        if (strcmp(filesystemType, "auto") == 0) {
                static const char *noauto_array[] = { "tmpfs", "shm", "proc", "ramfs", "devpts", "devfs", "usbdevfs", 0 };
                const char **noauto_fstype;
@@ -264,7 +265,35 @@ mount_one(char *blockDevice, char *directory, char *filesystemType,
                                        break;
                        }
                }
-       } else {
+       } 
+#else
+       if (strcmp(filesystemType, "auto") == 0) {
+               char buf[255];
+               FILE *f = xfopen("/proc/filesystems", "r");
+
+               while (fgets(buf, sizeof(buf), f) != NULL) {
+                       filesystemType = buf;
+                       if (*filesystemType == '\t') {  // Not a nodev filesystem
+
+                               // Add NULL termination to each line
+                               while (*filesystemType && *filesystemType != '\n')
+                                       filesystemType++;
+                               *filesystemType = '\0';
+
+                               filesystemType = buf;
+                               filesystemType++;       // hop past tab
+
+                               status = do_mount(blockDevice, directory, filesystemType,
+                                                                 flags | MS_MGC_VAL, string_flags,
+                                                                 useMtab, fakeIt, mtab_opts, mount_all);
+                               if (status == TRUE)
+                                       break;
+                       }
+               }
+               fclose(f);
+       }
+#endif
+       else {
                status = do_mount(blockDevice, directory, filesystemType,
                                flags | MS_MGC_VAL, string_flags, useMtab,
                                fakeIt, mtab_opts, mount_all);
@@ -279,7 +308,7 @@ mount_one(char *blockDevice, char *directory, char *filesystemType,
        return (TRUE);
 }
 
-void show_mounts()
+void show_mounts(void)
 {
 #if defined BB_FEATURE_USE_DEVPS_PATCH
        int fd, i, numfilesystems;