aboutsummaryrefslogtreecommitdiff
path: root/mount.c
diff options
context:
space:
mode:
Diffstat (limited to 'mount.c')
-rw-r--r--mount.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/mount.c b/mount.c
index 00a774a53..bde55d155 100644
--- a/mount.c
+++ b/mount.c
@@ -64,10 +64,12 @@ static int use_loop = FALSE;
64 64
65extern const char mtab_file[]; /* Defined in utility.c */ 65extern const char mtab_file[]; /* Defined in utility.c */
66 66
67static const char mount_usage[] = "\tmount [flags]\n" 67static const char mount_usage[] =
68 "\tmount [flags] device directory [-o options,more-options]\n" 68 "mount [flags] device directory [-o options,more-options]\n"
69 "\n" "Flags:\n" 69#ifndef BB_FEATURE_TRIVIAL_HELP
70 "\t-a:\t\tMount all file systems in fstab.\n" 70 "\nMount a filesystem\n\n"
71 "Flags:\n"
72 "\t-a:\t\tMount all filesystems in fstab.\n"
71#ifdef BB_MTAB 73#ifdef BB_MTAB
72 "\t-f:\t\t\"Fake\" mount. Add entry to mount table but don't mount it.\n" 74 "\t-f:\t\t\"Fake\" mount. Add entry to mount table but don't mount it.\n"
73 "\t-n:\t\tDon't write a mount table entry.\n" 75 "\t-n:\t\tDon't write a mount table entry.\n"
@@ -88,8 +90,10 @@ static const char mount_usage[] = "\tmount [flags]\n"
88 "\tsuid/nosuid:\tAllow set-user-id-root programs / disallow them.\n" 90 "\tsuid/nosuid:\tAllow set-user-id-root programs / disallow them.\n"
89 "\tremount:\tRe-mount a currently-mounted filesystem, changing its flags.\n" 91 "\tremount:\tRe-mount a currently-mounted filesystem, changing its flags.\n"
90 "\tro/rw:\t\tMount for read-only / read-write.\n" 92 "\tro/rw:\t\tMount for read-only / read-write.\n"
91 "There are EVEN MORE flags that are specific to each filesystem.\n" 93 "\nThere are EVEN MORE flags that are specific to each filesystem.\n"
92 "You'll have to see the written documentation for those.\n"; 94 "You'll have to see the written documentation for those.\n"
95#endif
96 ;
93 97
94 98
95struct mount_options { 99struct mount_options {
@@ -451,7 +455,7 @@ extern int mount_main(int argc, char **argv)
451 fatalError( "\nCannot read /etc/fstab: %s\n", strerror (errno)); 455 fatalError( "\nCannot read /etc/fstab: %s\n", strerror (errno));
452 456
453 while ((m = getmntent(f)) != NULL) { 457 while ((m = getmntent(f)) != NULL) {
454 // If the file system isn't noauto, 458 // If the filesystem isn't noauto,
455 // and isn't swap or nfs, then mount it 459 // and isn't swap or nfs, then mount it
456 if ((!strstr(m->mnt_opts, "noauto")) && 460 if ((!strstr(m->mnt_opts, "noauto")) &&
457 (!strstr(m->mnt_type, "swap")) && 461 (!strstr(m->mnt_type, "swap")) &&