diff options
| author | Glenn L McGrath <bug1@ihug.co.nz> | 2001-03-30 01:28:13 +0000 |
|---|---|---|
| committer | Glenn L McGrath <bug1@ihug.co.nz> | 2001-03-30 01:28:13 +0000 |
| commit | 1e117b47523e3001572277df29725e91bd786e39 (patch) | |
| tree | 667030dd79bab6fc5c5edb1c9b9b7ad4d6a7f110 | |
| parent | 84e229cfbe00d27ce81dad66c982bec0d50cdfd7 (diff) | |
Dont try and automount devfs, rename some variables
| -rw-r--r-- | mount.c | 12 | ||||
| -rw-r--r-- | util-linux/mount.c | 12 |
2 files changed, 12 insertions, 12 deletions
@@ -231,7 +231,7 @@ parse_mount_options(char *options, int *flags, char *strflags) } } -static int +extern int mount_one(char *blockDevice, char *directory, char *filesystemType, unsigned long flags, char *string_flags, int useMtab, int fakeIt, char *mtab_opts, int whineOnErrors) @@ -239,8 +239,8 @@ mount_one(char *blockDevice, char *directory, char *filesystemType, int status = 0; if (strcmp(filesystemType, "auto") == 0) { - static const char *strings[] = { "tmpfs", "shm", "proc", "ramfs", "devpts", 0 }; - const char** nodevfss; + static const char *noauto_array[] = { "tmpfs", "shm", "proc", "ramfs", "devpts", "devfs", 0 }; + const char **noauto_fstype; const int num_of_filesystems = sysfs(3, 0, 0); char buf[255]; int i=0; @@ -249,12 +249,12 @@ mount_one(char *blockDevice, char *directory, char *filesystemType, while(i < num_of_filesystems) { sysfs(2, i++, filesystemType); - for (nodevfss = strings; *nodevfss; nodevfss++) { - if (!strcmp(filesystemType, *nodevfss)) { + for (noauto_fstype = noauto_array; *noauto_fstype; noauto_fstype++) { + if (!strcmp(filesystemType, *noauto_fstype)) { break; } } - if (!*nodevfss) { + if (!*noauto_fstype) { status = do_mount(blockDevice, directory, filesystemType, flags | MS_MGC_VAL, string_flags, useMtab, fakeIt, mtab_opts); diff --git a/util-linux/mount.c b/util-linux/mount.c index 60509d5f3..9f7ac43c1 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c @@ -231,7 +231,7 @@ parse_mount_options(char *options, int *flags, char *strflags) } } -static int +extern int mount_one(char *blockDevice, char *directory, char *filesystemType, unsigned long flags, char *string_flags, int useMtab, int fakeIt, char *mtab_opts, int whineOnErrors) @@ -239,8 +239,8 @@ mount_one(char *blockDevice, char *directory, char *filesystemType, int status = 0; if (strcmp(filesystemType, "auto") == 0) { - static const char *strings[] = { "tmpfs", "shm", "proc", "ramfs", "devpts", 0 }; - const char** nodevfss; + static const char *noauto_array[] = { "tmpfs", "shm", "proc", "ramfs", "devpts", "devfs", 0 }; + const char **noauto_fstype; const int num_of_filesystems = sysfs(3, 0, 0); char buf[255]; int i=0; @@ -249,12 +249,12 @@ mount_one(char *blockDevice, char *directory, char *filesystemType, while(i < num_of_filesystems) { sysfs(2, i++, filesystemType); - for (nodevfss = strings; *nodevfss; nodevfss++) { - if (!strcmp(filesystemType, *nodevfss)) { + for (noauto_fstype = noauto_array; *noauto_fstype; noauto_fstype++) { + if (!strcmp(filesystemType, *noauto_fstype)) { break; } } - if (!*nodevfss) { + if (!*noauto_fstype) { status = do_mount(blockDevice, directory, filesystemType, flags | MS_MGC_VAL, string_flags, useMtab, fakeIt, mtab_opts); |