Removed trailing \n from error_msg{,_and_die} messages.
[oweals/busybox.git] / util-linux / mount.c
index 827a56f0addcaead4a46abf18aa7dc80fad68a80..b571e5035c658a3edd2ad20c8a271a02ab77451c 100644 (file)
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini mount implementation for busybox
  *
  * 1999-04-17  Dave Cinege...Rewrote -t auto. Fixed ro mtab.
  *
  * 1999-10-07  Erik Andersen <andersen@lineo.com>, <andersee@debian.org>.
- *              Rewrote of a lot of code. Removed mtab usage (I plan on
+ *              Rewrite of a lot of code. Removed mtab usage (I plan on
  *              putting it back as a compile-time option some time), 
  *              major adjustments to option parsing, and some serious 
  *              dieting all around.
-*/
+ *
+ * 1999-11-06  mtab suppport is back - andersee
+ *
+ * 2000-01-12   Ben Collins <bcollins@debian.org>, Borrowed utils-linux's
+ *              mount to add loop support.
+ *
+ * 2000-04-30  Dave Cinege <dcinege@psychosis.com>
+ *             Rewrote fstab while loop and lower mount section. Can now do
+ *             single mounts from fstab. Can override fstab options for single
+ *             mount. Common mount_one call for single mounts and 'all'. Fixed
+ *             mtab updating and stale entries. Removed 'remount' default. 
+ *     
+ */
 
-#include "internal.h"
+#include "busybox.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
 #include <mntent.h>
-#include <sys/mount.h>
 #include <ctype.h>
-#include <fstab.h>
+#if defined BB_FEATURE_USE_DEVPS_PATCH
+#include <linux/devmtab.h> /* For Erik's nifty devmtab device driver */
+#endif
+
+enum {
+       MS_MGC_VAL = 0xc0ed0000, /* Magic number indicatng "new" flags */
+       MS_RDONLY = 1,      /* Mount read-only */
+       MS_NOSUID = 2,      /* Ignore suid and sgid bits */
+       MS_NODEV = 4,      /* Disallow access to device special files */
+       MS_NOEXEC = 8,      /* Disallow program execution */
+       MS_SYNCHRONOUS = 16,      /* Writes are synced at once */
+       MS_REMOUNT = 32,      /* Alter flags of a mounted FS */
+       MS_MANDLOCK = 64,      /* Allow mandatory locks on an FS */
+       S_QUOTA = 128,     /* Quota initialized for file/directory/symlink */
+       S_APPEND = 256,     /* Append-only file */
+       S_IMMUTABLE = 512,     /* Immutable file */
+       MS_NOATIME = 1024,    /* Do not update access times. */
+       MS_NODIRATIME = 2048,    /* Do not update directory access times */
+};
 
-extern const char mtab_file[]; /* Defined in utility.c */
 
-static const char mount_usage[] = "\tmount [flags]\n"
-    "\tmount [flags] device directory [-o options,more-options]\n"
-    "\n"
-    "Flags:\n"
-    "\t-a:\tMount all file systems in fstab.\n"
-#ifdef BB_MTAB
-    "\t-f:\t\"Fake\" mount. Add entry to mount table but don't mount it.\n"
-    "\t-n:\tDon't write a mount table entry.\n"
+#if defined BB_FEATURE_MOUNT_LOOP
+#include <fcntl.h>
+#include <sys/ioctl.h>
+static int use_loop = FALSE;
 #endif
-    "\t-o option:\tOne of many filesystem options, listed below.\n"
-    "\t-r:\tMount the filesystem read-only.\n"
-    "\t-t filesystem-type:\tSpecify the filesystem type.\n"
-    "\t-w:\tMount for reading and writing (default).\n"
-    "\n"
-    "Options for use with the \"-o\" flag:\n"
-    "\tasync / sync:\tWrites are asynchronous / synchronous.\n"
-    "\tdev / nodev:\tAllow use of special device files / disallow them.\n"
-    "\texec / noexec:\tAllow use of executable files / disallow them.\n"
-    "\tsuid / nosuid:\tAllow set-user-id-root programs / disallow them.\n"
-    "\tremount: Re-mount a currently-mounted filesystem, changing its flags.\n"
-    "\tro / rw: Mount for read-only / read-write.\n"
-    "\t"
-    "There are EVEN MORE flags that are specific to each filesystem.\n"
-    "You'll have to see the written documentation for those.\n";
+
+extern int mount (__const char *__special_file, __const char *__dir,
+                       __const char *__fstype, unsigned long int __rwflag,
+                       __const void *__data);
+extern int umount (__const char *__special_file);
+extern int umount2 (__const char *__special_file, int __flags);
 
 
+extern const char mtab_file[]; /* Defined in utility.c */
+
 struct mount_options {
-    const char *name;
-    unsigned long and;
-    unsigned long or;
+       const char *name;
+       unsigned long and;
+       unsigned long or;
 };
 
 static const struct mount_options mount_options[] = {
-    {"async", ~MS_SYNCHRONOUS, 0},
-    {"defaults", ~0, 0},
-    {"dev", ~MS_NODEV, 0},
-    {"exec", ~MS_NOEXEC, 0},
-    {"nodev", ~0, MS_NODEV},
-    {"noexec", ~0, MS_NOEXEC},
-    {"nosuid", ~0, MS_NOSUID},
-    {"remount", ~0, MS_REMOUNT},
-    {"ro", ~0, MS_RDONLY},
-    {"rw", ~MS_RDONLY, 0},
-    {"suid", ~MS_NOSUID, 0},
-    {"sync", ~0, MS_SYNCHRONOUS},
-    {0, 0, 0}
+       {"async", ~MS_SYNCHRONOUS, 0},
+       {"atime", ~0, ~MS_NOATIME},
+       {"defaults", ~0, 0},
+       {"dev", ~MS_NODEV, 0},
+       {"diratime", ~0, ~MS_NODIRATIME},
+       {"exec", ~MS_NOEXEC, 0},
+       {"noatime", ~0, MS_NOATIME},
+       {"nodev", ~0, MS_NODEV},
+       {"nodiratime", ~0, MS_NODIRATIME},
+       {"noexec", ~0, MS_NOEXEC},
+       {"nosuid", ~0, MS_NOSUID},
+       {"remount", ~0, MS_REMOUNT},
+       {"ro", ~0, MS_RDONLY},
+       {"rw", ~MS_RDONLY, 0},
+       {"suid", ~MS_NOSUID, 0},
+       {"sync", ~0, MS_SYNCHRONOUS},
+       {0, 0, 0}
 };
 
-#if ! defined BB_MTAB
-#define do_mount(specialfile, dir, filesystemtype, flags, string_flags, useMtab, fakeIt) \
-       mount(specialfile, dir, filesystemtype, flags, string_flags)
-#else
 static int
-do_mount(char* specialfile, char* dir, char* filesystemtype, 
-       long flags, void* string_flags, int useMtab, int fakeIt)
+do_mount(char *specialfile, char *dir, char *filesystemtype,
+                long flags, void *string_flags, int useMtab, int fakeIt,
+                char *mtab_opts)
 {
-    int status=0;
-
-    if (fakeIt==FALSE)
-       status=mount(specialfile, dir, filesystemtype, flags, string_flags);
-
-    if ( status == 0 ) {
-       if ( useMtab==TRUE )
-           write_mtab(specialfile, dir, filesystemtype, flags, string_flags);
-       return 0;
-    }
-    else 
-       return( status);
-}
+       int status = 0;
+#if defined BB_FEATURE_MOUNT_LOOP
+       char *lofile = NULL;
 #endif
 
+       if (fakeIt == FALSE)
+       {
+#if defined BB_FEATURE_MOUNT_LOOP
+               if (use_loop==TRUE) {
+                       int loro = flags & MS_RDONLY;
+                       char *lofile = specialfile;
 
-/* Seperate standard mount options from the nonstandard string options */
-static void
-parse_mount_options ( char *options, unsigned long *flags, char *strflags)
-{
-    while (options) {
-       int gotone=FALSE;
-       char *comma = strchr (options, ',');
-       const struct mount_options* f = mount_options;
-       if (comma)
-           *comma = '\0';
-
-       while (f->name != 0) {
-           if (strcasecmp (f->name, options) == 0) {
-
-               *flags &= f->and;
-               *flags |= f->or;
-               gotone=TRUE;
-               break;
-           }
-           f++;
+                       specialfile = find_unused_loop_device();
+                       if (specialfile == NULL) {
+                               error_msg_and_die("Could not find a spare loop device");
+                       }
+                       if (set_loop(specialfile, lofile, 0, &loro)) {
+                               error_msg_and_die("Could not setup loop device");
+                       }
+                       if (!(flags & MS_RDONLY) && loro) {     /* loop is ro, but wanted rw */
+                               error_msg("WARNING: loop device is read-only");
+                               flags &= ~MS_RDONLY;
+                       }
+               }
+#endif
+               status = mount(specialfile, dir, filesystemtype, flags, string_flags);
+               if (errno == EROFS) {
+                       error_msg("%s is write-protected, mounting read-only", specialfile);
+                       status = mount(specialfile, dir, filesystemtype, flags |= MS_RDONLY, string_flags);
+               }
        }
-       if (*strflags && strflags!= '\0' && gotone==FALSE) {
-           char *temp=strflags;
-           temp += strlen (strflags);
-           *temp++ = ',';
-           *temp++ = '\0';
+
+
+       /* If the mount was sucessful, do anything needed, then return TRUE */
+       if (status == 0 || fakeIt==TRUE) {
+
+#if defined BB_MTAB
+               if (useMtab == TRUE) {
+                       erase_mtab(specialfile);        // Clean any stale entries
+                       write_mtab(specialfile, dir, filesystemtype, flags, mtab_opts);
+               }
+#endif
+               return (TRUE);
        }
-       if (gotone==FALSE) {
-           strcat (strflags, options);
-           gotone=FALSE;
+
+       /* Bummer.  mount failed.  Clean up */
+#if defined BB_FEATURE_MOUNT_LOOP
+       if (lofile != NULL) {
+               del_loop(specialfile);
        }
-       if (comma) {
-           *comma = ',';
-           options = ++comma;
-       } else {
-           break;
+#endif
+
+       if (errno == EPERM) {
+               error_msg_and_die("permission denied. Are you root?");
+       }
+
+       return (FALSE);
+}
+
+
+
+/* Seperate standard mount options from the nonstandard string options */
+static void
+parse_mount_options(char *options, int *flags, char *strflags)
+{
+       while (options) {
+               int gotone = FALSE;
+               char *comma = strchr(options, ',');
+               const struct mount_options *f = mount_options;
+
+               if (comma)
+                       *comma = '\0';
+
+               while (f->name != 0) {
+                       if (strcasecmp(f->name, options) == 0) {
+
+                               *flags &= f->and;
+                               *flags |= f->or;
+                               gotone = TRUE;
+                               break;
+                       }
+                       f++;
+               }
+#if defined BB_FEATURE_MOUNT_LOOP
+               if (gotone == FALSE && !strcasecmp("loop", options)) {  /* loop device support */
+                       use_loop = TRUE;
+                       gotone = TRUE;
+               }
+#endif
+               if (*strflags && strflags != '\0' && gotone == FALSE) {
+                       char *temp = strflags;
+
+                       temp += strlen(strflags);
+                       *temp++ = ',';
+                       *temp++ = '\0';
+               }
+               if (gotone == FALSE)
+                       strcat(strflags, options);
+               if (comma) {
+                       *comma = ',';
+                       options = ++comma;
+               } else {
+                       break;
+               }
        }
-    }
 }
 
 int
 mount_one(char *blockDevice, char *directory, char *filesystemType,
-          unsigned long flags, char *string_flags, int useMtab, int fakeIt)
+                 unsigned long flags, char *string_flags, int useMtab, int fakeIt,
+                 char *mtab_opts, int whineOnErrors)
 {
-    int status = 0;
+       int status = 0;
 
-    char buf[255];
+#if defined BB_FEATURE_USE_PROCFS
+       char buf[255];
+       if (strcmp(filesystemType, "auto") == 0) {
+               FILE *f = fopen("/proc/filesystems", "r");
 
-    if (strcmp(filesystemType, "auto") == 0) {
-       FILE *f = fopen ("/proc/filesystems", "r");
+               if (f == NULL)
+                       return (FALSE);
 
-       if (f == NULL)
-           return( FALSE);
+               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);
+                               if (status == TRUE)
+                                       break;
+                       }
+               }
+               fclose(f);
+       } else
+#endif
+#if defined BB_FEATURE_USE_DEVPS_PATCH
+       if (strcmp(filesystemType, "auto") == 0) {
+               int fd, i, numfilesystems;
+               char device[] = "/dev/mtab";
+               struct k_fstype *fslist;
 
-       while (fgets (buf, sizeof (buf), f) != NULL) {
-           filesystemType = buf;
-           if (*filesystemType == '\t') {      // Not a nodev filesystem
+               /* open device */ 
+               fd = open(device, O_RDONLY);
+               if (fd < 0)
+                       perror_msg_and_die("open failed for `%s'", device);
 
-               // Add NULL termination to each line
-               while (*filesystemType && *filesystemType != '\n')
-                   filesystemType++;
-               *filesystemType = '\0';
+               /* How many filesystems?  We need to know to allocate enough space */
+               numfilesystems = ioctl (fd, DEVMTAB_COUNT_FILESYSTEMS);
+               if (numfilesystems<0)
+                       perror_msg_and_die("\nDEVMTAB_COUNT_FILESYSTEMS");
+               fslist = (struct k_fstype *) xcalloc ( numfilesystems, sizeof(struct k_fstype));
 
-               filesystemType = buf;
-               filesystemType++;       // hop past tab
+               /* Grab the list of available filesystems */
+               status = ioctl (fd, DEVMTAB_GET_FILESYSTEMS, fslist);
+               if (status<0)
+                       perror_msg_and_die("\nDEVMTAB_GET_FILESYSTEMS");
 
-               status = do_mount (blockDevice, directory, filesystemType,
-                               flags | MS_MGC_VAL, string_flags, useMtab, fakeIt);
-               if (status == 0)
-                   break;
-           }
+               /* Walk the list trying to mount filesystems 
+                * that do not claim to be nodev filesystems */
+               for( i = 0 ; i < numfilesystems ; i++) {
+                       if (fslist[i].mnt_nodev)
+                               continue;
+                       status = do_mount(blockDevice, directory, fslist[i].mnt_type,
+                                                         flags | MS_MGC_VAL, string_flags,
+                                                         useMtab, fakeIt, mtab_opts);
+                       if (status == TRUE)
+                               break;
+               }
+               free( fslist);
+               close(fd);
+       } else
+#endif
+       {
+               status = do_mount(blockDevice, directory, filesystemType,
+                                                 flags | MS_MGC_VAL, string_flags, useMtab,
+                                                 fakeIt, mtab_opts);
        }
-       fclose (f);
-    } else {
-       status = do_mount (blockDevice, directory, filesystemType,
-                       flags | MS_MGC_VAL, string_flags, useMtab, fakeIt);
-    }
-
-    if (status) {
-       fprintf (stderr, "Mounting %s on %s failed: %s\n",
-                blockDevice, directory, strerror(errno));
-       return (FALSE);
-    }
-    return (TRUE);
+
+       if (status == FALSE) {
+               if (whineOnErrors == TRUE) {
+                       perror_msg("Mounting %s on %s failed", blockDevice, directory);
+               }
+               return (FALSE);
+       }
+       return (TRUE);
 }
 
-extern int mount_main (int argc, char **argv)
+extern int mount_main(int argc, char **argv)
 {
-    char string_flags[1024]="";
-    unsigned long flags = 0;
-    char *filesystemType = "auto";
-    char *device = NULL;
-    char *directory = NULL;
-    int all = FALSE;
-    int fakeIt = FALSE;
-    int useMtab = TRUE;
-    int i;
-
-    /* Only compiled in if BB_MTAB is not defined */
-    whine_if_fstab_is_missing();
-
-    if (argc == 1) {
-       FILE *mountTable = setmntent (mtab_file, "r");
-       if (mountTable) {
-           struct mntent *m;
-           while ((m = getmntent (mountTable)) != 0) {
-               struct fstab* fstabItem;
-               char *blockDevice = m->mnt_fsname;
-               /* Note that if /etc/fstab is missing, libc can't fix up /dev/root for us */
-               if (strcmp (blockDevice, "/dev/root") == 0) {
-                   fstabItem = getfsfile ("/");
-                   if (fstabItem != NULL)
-                       blockDevice = fstabItem->fs_spec;
+       char string_flags_buf[1024] = "";
+       char *string_flags = string_flags_buf;
+       char *extra_opts = string_flags_buf;
+       int flags = 0;
+       char *filesystemType = "auto";
+       char *device = NULL;
+       char *directory = NULL;
+       int all = FALSE;
+       int fakeIt = FALSE;
+       int useMtab = TRUE;
+       int i;
+       int rc = EXIT_FAILURE;
+       int fstabmount = FALSE; 
+
+#if defined BB_FEATURE_USE_DEVPS_PATCH
+       if (argc == 1) {
+               int fd, i, numfilesystems;
+               char device[] = "/dev/mtab";
+               struct k_mntent *mntentlist;
+
+               /* open device */ 
+               fd = open(device, O_RDONLY);
+               if (fd < 0)
+                       perror_msg_and_die("open failed for `%s'", device);
+
+               /* How many mounted filesystems?  We need to know to 
+                * allocate enough space for later... */
+               numfilesystems = ioctl (fd, DEVMTAB_COUNT_MOUNTS);
+               if (numfilesystems<0)
+                       perror_msg_and_die( "\nDEVMTAB_COUNT_MOUNTS");
+               mntentlist = (struct k_mntent *) xcalloc ( numfilesystems, sizeof(struct k_mntent));
+               
+               /* Grab the list of mounted filesystems */
+               if (ioctl (fd, DEVMTAB_GET_MOUNTS, mntentlist)<0)
+                       perror_msg_and_die( "\nDEVMTAB_GET_MOUNTS");
+
+               for( i = 0 ; i < numfilesystems ; i++) {
+                       printf( "%s %s %s %s %d %d\n", mntentlist[i].mnt_fsname,
+                                       mntentlist[i].mnt_dir, mntentlist[i].mnt_type, 
+                                       mntentlist[i].mnt_opts, mntentlist[i].mnt_freq, 
+                                       mntentlist[i].mnt_passno);
                }
-               printf ("%s on %s type %s (%s)\n", blockDevice, m->mnt_dir,
-                       m->mnt_type, m->mnt_opts);
-           }
-           endmntent (mountTable);
-       } else {
-           perror(mtab_file);
+#ifdef BB_FEATURE_CLEAN_UP
+               /* Don't bother to close files or free memory.  Exit 
+                * does that automagically, so we can save a few bytes */
+               free( mntentlist);
+               close(fd);
+#endif
+               return EXIT_SUCCESS;
        }
-       exit( TRUE);
-    }
-
-
-    /* Parse options */
-    i = --argc;
-    argv++;
-    while (i > 0 && **argv) {
-       if (**argv == '-') {
-           while (i>0 && *++(*argv)) switch (**argv) {
-           case 'o':
-               if (--i == 0) {
-                   goto goodbye;
-               }
-               parse_mount_options (*(++argv), &flags, string_flags);
-               --i;
-               ++argv;
-               break;
-           case 'r':
-               flags |= MS_RDONLY;
-               break;
-           case 't':
-               if (--i == 0) {
-                   goto goodbye;
+#else
+       if (argc == 1) {
+               FILE *mountTable = setmntent(mtab_file, "r");
+
+               if (mountTable) {
+                       struct mntent *m;
+
+                       while ((m = getmntent(mountTable)) != 0) {
+                               char *blockDevice = m->mnt_fsname;
+                               if (strcmp(blockDevice, "/dev/root") == 0) {
+                                       find_real_root_device_name( blockDevice);
+                               }
+                               printf("%s on %s type %s (%s)\n", blockDevice, m->mnt_dir,
+                                          m->mnt_type, m->mnt_opts);
+                       }
+                       endmntent(mountTable);
+               } else {
+                       perror_msg_and_die("%s", mtab_file);
                }
-               filesystemType = *(++argv);
-               --i;
-               ++argv;
-               break;
-           case 'w':
-               flags &= ~MS_RDONLY;
-               break;
-           case 'a':
-               all = TRUE;
-               break;
+               return EXIT_SUCCESS;
+       }
+#endif
+
+       /* Parse options */
+       i = --argc;
+       argv++;
+       while (i > 0 && **argv) {
+               if (**argv == '-') {
+                       char *opt = *argv;
+
+                       while (i > 0 && *++opt)
+                               switch (*opt) {
+                               case 'o':
+                                       if (--i == 0) {
+                                               goto goodbye;
+                                       }
+                                       parse_mount_options(*(++argv), &flags, string_flags);
+                                       break;
+                               case 'r':
+                                       flags |= MS_RDONLY;
+                                       break;
+                               case 't':
+                                       if (--i == 0) {
+                                               goto goodbye;
+                                       }
+                                       filesystemType = *(++argv);
+                                       break;
+                               case 'w':
+                                       flags &= ~MS_RDONLY;
+                                       break;
+                               case 'a':
+                                       all = TRUE;
+                                       break;
+                               case 'f':
+                                       fakeIt = TRUE;
+                                       break;
 #ifdef BB_MTAB
-           case 'f':
-               fakeIt = TRUE;
-               break;
-           case 'n':
-               useMtab = FALSE;
-               break;
+                               case 'n':
+                                       useMtab = FALSE;
+                                       break;
 #endif
-           case 'v':
-           case 'h':
-           case '-':
-               goto goodbye;
-           }
-       } else {
-           if (device == NULL)
-               device=*argv;
-           else if (directory == NULL)
-               directory=*argv;
-           else {
-               goto goodbye;
-           }
+                               case 'v':
+                                       break; /* ignore -v */
+                               case 'h':
+                               case '-':
+                                       goto goodbye;
+                               }
+               } else {
+                       if (device == NULL)
+                               device = *argv;
+                       else if (directory == NULL)
+                               directory = *argv;
+                       else {
+                               goto goodbye;
+                       }
+               }
+               i--;
+               argv++;
        }
-       i--;
-       argv++;
-    }
 
-    if (all == TRUE) {
-       struct mntent *m;
-       FILE *f = setmntent ("/etc/fstab", "r");
+       if (all == TRUE || directory == NULL) {
+               struct mntent *m;
+               FILE *f = setmntent("/etc/fstab", "r");
+               fstabmount = TRUE;
 
-       if (f == NULL) {
-           perror("/etc/fstab");
-           exit( FALSE); 
-       }
-       while ((m = getmntent (f)) != NULL) {
-           // If the file system isn't noauto, and isn't mounted on /, 
-           // and isn't swap or nfs, then mount it
-           if ((!strstr (m->mnt_opts, "noauto")) &&
-                   (m->mnt_dir[1] != '\0') && 
-                   (!strstr (m->mnt_type, "swap")) && 
-                   (!strstr (m->mnt_type, "nfs"))) 
-           {
-               flags = 0;
-               *string_flags = '\0';
-               parse_mount_options(m->mnt_opts, &flags, string_flags);
-               mount_one (m->mnt_fsname, m->mnt_dir, m->mnt_type, 
-                       flags, string_flags, useMtab, fakeIt);
-           }
-       }
-       endmntent (f);
-    } else {
-       if (device && directory) {
-           exit (mount_one (device, directory, filesystemType, 
-                       flags, string_flags, useMtab, fakeIt));
-       } else {
-           goto goodbye;
-       }
-    }
-    exit( TRUE);
+               if (f == NULL)
+                       perror_msg_and_die( "\nCannot read /etc/fstab");
 
+               while ((m = getmntent(f)) != NULL) {
+                       if (all == FALSE && directory == NULL && (
+                               (strcmp(device, m->mnt_fsname) != 0) &&
+                               (strcmp(device, m->mnt_dir) != 0) ) ) {
+                               continue;
+                       }
+                       
+                       if (all == TRUE && (                            // If we're mounting 'all'
+                               (strstr(m->mnt_opts, "noauto")) ||      // and the file system isn't noauto,
+                               (strstr(m->mnt_type, "swap")) ||        // and isn't swap or nfs, then mount it
+                               (strstr(m->mnt_type, "nfs")) ) ) {
+                               continue;
+                       }
+                       
+                       if (all == TRUE || flags == 0) {        // Allow single mount to override fstab flags
+                               flags = 0;
+                               *string_flags = '\0';
+                               parse_mount_options(m->mnt_opts, &flags, string_flags);
+                       }
+                       
+                       device = strdup(m->mnt_fsname);
+                       directory = strdup(m->mnt_dir);
+                       filesystemType = strdup(m->mnt_type);
+singlemount:                   
+                       rc = EXIT_SUCCESS;
+#ifdef BB_NFSMOUNT
+                       if (strchr(device, ':') != NULL)
+                               filesystemType = "nfs";
+                       if (strcmp(filesystemType, "nfs") == 0) {
+                               rc = nfsmount (device, directory, &flags,
+                                       &extra_opts, &string_flags, 1);
+                               if ( rc != 0) {
+                                       perror_msg_and_die("nfsmount failed");  
+                                       rc = EXIT_FAILURE;
+                               }
+                       }
+#endif
+                       if (!mount_one(device, directory, filesystemType, flags,
+                                       string_flags, useMtab, fakeIt, extra_opts, TRUE))
+                               rc = EXIT_FAILURE;
+                               
+                       if (all == FALSE)
+                               break;
+               }
+               if (fstabmount == TRUE)
+                       endmntent(f);
+                       
+               if (all == FALSE && fstabmount == TRUE && directory == NULL)
+                       fprintf(stderr, "Can't find %s in /etc/fstab\n", device);
+       
+               exit(rc);
+       }
+       
+       goto singlemount;
+       
 goodbye:
-    usage( mount_usage);
+       usage(mount_usage);
 }