OSDN Git Service

Doh! I broke automatic filesystem type guessing. Fix mount so
authorEric Andersen <andersen@codepoet.org>
Fri, 12 Dec 2003 07:01:14 +0000 (07:01 -0000)
committerEric Andersen <andersen@codepoet.org>
Fri, 12 Dec 2003 07:01:14 +0000 (07:01 -0000)
it will properly fall back to /proc/mounts when /etc/filesystems
is missing, allowing mount to guess the correct fs type when a
fs type is not explicitly specified.
 -Erik

util-linux/mount.c

index 43856ea..8a1f4a1 100644 (file)
@@ -284,6 +284,8 @@ static int mount_one(char *blockDevice, char *directory, char *filesystemType,
                                }
                        }
                        fclose(f);
+               } else {
+                       read_proc = 1;
                }
 
                if (read_proc && !status) {
@@ -314,8 +316,7 @@ static int mount_one(char *blockDevice, char *directory, char *filesystemType,
                        fclose(f);
                }
        } else {
-               status =
-                       do_mount(blockDevice, directory, filesystemType,
+               status = do_mount(blockDevice, directory, filesystemType,
                                         flags | MS_MGC_VAL, string_flags, useMtab, fakeIt,
                                         mtab_opts, mount_all);
        }