* Mini mount implementation for busybox
*
* Copyright (C) 1995, 1996 by Bruce Perens <bruce@pixar.com>.
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* 1999-04-17 Dave Cinege...Rewrote -t auto. Fixed ro mtab.
*
- * 1999-10-07 Erik Andersen <andersen@lineo.com>, <andersee@debian.org>.
+ * 1999-10-07 Erik Andersen <andersen@codepoet.org>.
* 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
+ * 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
+ * 1999-11-06 mtab support 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 <limits.h>
#include <stdlib.h>
#include <unistd.h>
#include <errno.h>
#include <stdio.h>
#include <mntent.h>
#include <ctype.h>
-#if defined BB_FEATURE_USE_DEVPS_PATCH
-#include <linux/devmtab.h> /* For Erik's nifty devmtab device driver */
-#endif
-
+#include "busybox.h"
-#define MS_MGC_VAL 0xc0ed0000 /* Magic number indicatng "new" flags */
-#define MS_RDONLY 1 /* Mount read-only */
-#define MS_NOSUID 2 /* Ignore suid and sgid bits */
-#define MS_NODEV 4 /* Disallow access to device special files */
-#define MS_NOEXEC 8 /* Disallow program execution */
-#define MS_SYNCHRONOUS 16 /* Writes are synced at once */
-#define MS_REMOUNT 32 /* Alter flags of a mounted FS */
-#define MS_MANDLOCK 64 /* Allow mandatory locks on an FS */
-#define S_QUOTA 128 /* Quota initialized for file/directory/symlink */
-#define S_APPEND 256 /* Append-only file */
-#define S_IMMUTABLE 512 /* Immutable file */
-#define MS_NOATIME 1024 /* Do not update access times. */
-#define MS_NODIRATIME 2048 /* Do not update directory access times */
+#ifdef CONFIG_NFSMOUNT
+#if defined(__UCLIBC__) && ! defined(__UCLIBC_HAS_RPC__)
+#error "You need to build uClibc with UCLIBC_HAS_RPC for busybox mount with NFS support to compile."
+#endif
+#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 */
+ MS_BIND = 4096, /* Use the new linux 2.4.x "mount --bind" feature */
+ MS_MOVE = 8192, /* Use the new linux 2.4.x "mount --move" feature */
+};
-#if defined BB_FEATURE_MOUNT_LOOP
+#if defined CONFIG_FEATURE_MOUNT_LOOP
#include <fcntl.h>
#include <sys/ioctl.h>
static int use_loop = FALSE;
#endif
-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 */
-
-static const char mount_usage[] =
- "mount [flags] device directory [-o options,more-options]\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\nMount a filesystem\n\n"
- "Flags:\n"
- "\t-a:\t\tMount all filesystems in fstab.\n"
-#ifdef BB_MTAB
- "\t-f:\t\t\"Fake\" mount. Add entry to mount table but don't mount it.\n"
- "\t-n:\t\tDon't write a mount table entry.\n"
-#endif
- "\t-o option:\tOne of many filesystem options, listed below.\n"
- "\t-r:\t\tMount the filesystem read-only.\n"
- "\t-t fs-type:\tSpecify the filesystem type.\n"
- "\t-w:\t\tMount for reading and writing (default).\n"
- "\n"
- "Options for use with the \"-o\" flag:\n"
- "\tasync/sync:\tWrites are asynchronous / synchronous.\n"
- "\tatime/noatime:\tEnable / disable updates to inode access times.\n"
- "\tdev/nodev:\tAllow use of special device files / disallow them.\n"
- "\texec/noexec:\tAllow use of executable files / disallow them.\n"
-#if defined BB_FEATURE_MOUNT_LOOP
- "\tloop:\t\tMounts a file via loop device.\n"
-#endif
- "\tsuid/nosuid:\tAllow set-user-id-root programs / disallow them.\n"
- "\tremount:\tRe-mount a currently-mounted filesystem, changing its flags.\n"
- "\tro/rw:\t\tMount for read-only / read-write.\n"
- "\nThere are EVEN MORE flags that are specific to each filesystem.\n"
- "You'll have to see the written documentation for those.\n"
-#endif
- ;
+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 int sysfs(int option, unsigned int fs_index, char *buf);
struct mount_options {
const char *name;
{"async", ~MS_SYNCHRONOUS, 0},
{"atime", ~0, ~MS_NOATIME},
{"defaults", ~0, 0},
+ {"noauto", ~0, 0},
{"dev", ~MS_NODEV, 0},
{"diratime", ~0, ~MS_NODIRATIME},
{"exec", ~MS_NOEXEC, 0},
{"rw", ~MS_RDONLY, 0},
{"suid", ~MS_NOSUID, 0},
{"sync", ~0, MS_SYNCHRONOUS},
+ {"bind", ~0, MS_BIND},
+ {"move", ~0, MS_MOVE},
{0, 0, 0}
};
static int
-do_mount(char *specialfile, char *dir, char *filesystemtype,
- long flags, void *string_flags, int useMtab, int fakeIt,
- char *mtab_opts)
+do_mount(char *specialfile, char *dir, char *filesystemtype, long flags,
+ void *string_flags, int useMtab, int fakeIt, char *mtab_opts,
+ int mount_all)
{
int status = 0;
- char *lofile = NULL;
-#if defined BB_MTAB
- if (fakeIt == FALSE)
+#if defined CONFIG_FEATURE_MOUNT_LOOP
+ char *lofile = NULL;
#endif
- {
-#if defined BB_FEATURE_MOUNT_LOOP
- if (use_loop==TRUE) {
+
+ if (!fakeIt) {
+#if defined CONFIG_FEATURE_MOUNT_LOOP
+ if (use_loop == TRUE) {
int loro = flags & MS_RDONLY;
- char *lofile = specialfile;
+
+ lofile = specialfile;
specialfile = find_unused_loop_device();
if (specialfile == NULL) {
- fprintf(stderr, "Could not find a spare loop device\n");
- return (FALSE);
+ bb_error_msg_and_die("Could not find a spare loop device");
}
if (set_loop(specialfile, lofile, 0, &loro)) {
- fprintf(stderr, "Could not setup loop device\n");
- return (FALSE);
+ bb_error_msg_and_die("Could not setup loop device");
}
if (!(flags & MS_RDONLY) && loro) { /* loop is ro, but wanted rw */
- fprintf(stderr, "WARNING: loop device is read-only\n");
- flags &= ~MS_RDONLY;
+ bb_error_msg("WARNING: loop device is read-only");
+ flags |= MS_RDONLY;
}
}
#endif
status = mount(specialfile, dir, filesystemtype, flags, string_flags);
+ if (status < 0 && errno == EROFS) {
+ bb_error_msg("%s is write-protected, mounting read-only",
+ specialfile);
+ status = mount(specialfile, dir, filesystemtype, flags |=
+ MS_RDONLY, string_flags);
+ }
+ /* Don't whine about already mounted filesystems when mounting all. */
+ if (status < 0 && errno == EBUSY && mount_all) {
+ return TRUE;
+ }
}
/* If the mount was sucessful, do anything needed, then return TRUE */
- if (status == 0) {
+ if (status == 0 || fakeIt == TRUE) {
-#if defined BB_MTAB
- if (useMtab == TRUE) {
+#if defined CONFIG_FEATURE_MTAB_SUPPORT
+ if (useMtab) {
+ erase_mtab(specialfile); /* Clean any stale entries */
write_mtab(specialfile, dir, filesystemtype, flags, mtab_opts);
}
#endif
}
/* Bummer. mount failed. Clean up */
-#if defined BB_FEATURE_MOUNT_LOOP
+#if defined CONFIG_FEATURE_MOUNT_LOOP
if (lofile != NULL) {
del_loop(specialfile);
}
#endif
if (errno == EPERM) {
- fatalError("permission denied. Are you root?\n");
+ bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
}
return (FALSE);
}
+static void paste_str(char **s1, const char *s2)
+{
+ *s1 = xrealloc(*s1, strlen(*s1) + strlen(s2) + 1);
+ strcat(*s1, s2);
+}
/* Seperate standard mount options from the nonstandard string options */
-static void
-parse_mount_options(char *options, unsigned long *flags, char *strflags)
+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)
+ if (comma) {
*comma = '\0';
+ }
while (f->name != 0) {
if (strcasecmp(f->name, options) == 0) {
}
f++;
}
-#if defined BB_FEATURE_MOUNT_LOOP
- if (gotone == FALSE && !strcasecmp("loop", options)) { /* loop device support */
+#if defined CONFIG_FEATURE_MOUNT_LOOP
+ if (!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) {
+ if (**strflags) {
+ /* have previous parsed options */
+ paste_str(strflags, ",");
+ }
+ paste_str(strflags, options);
}
- if (gotone == FALSE)
- strcat(strflags, options);
if (comma) {
*comma = ',';
options = ++comma;
}
}
-int
-mount_one(char *blockDevice, char *directory, char *filesystemType,
- unsigned long flags, char *string_flags, int useMtab, int fakeIt,
- char *mtab_opts, int whineOnErrors)
+static int mount_one(char *blockDevice, char *directory, char *filesystemType,
+ unsigned long flags, char *string_flags, int useMtab,
+ int fakeIt, char *mtab_opts, int whineOnErrors,
+ int mount_all)
{
int status = 0;
-
-#if defined BB_FEATURE_USE_PROCFS
- char buf[255];
if (strcmp(filesystemType, "auto") == 0) {
- FILE *f = fopen("/proc/filesystems", "r");
+ char buf[255];
+ FILE *f;
+ int read_proc = 0;
+
+ f = fopen("/etc/filesystems", "r");
+
+ if (f) {
+ while (fgets(buf, sizeof(buf), f)) {
+ if (*buf == '*') {
+ read_proc = 1;
+ } else if (*buf == '#') {
+ continue;
+ } else {
+ filesystemType = buf;
+
+ /* Add NULL termination to each line */
+ while (*filesystemType && !isspace(*filesystemType)) {
+ filesystemType++;
+ }
+ *filesystemType = '\0';
- if (f == NULL)
- return (FALSE);
+ filesystemType = buf;
- while (fgets(buf, sizeof(buf), f) != NULL) {
- filesystemType = buf;
- if (*filesystemType == '\t') { // Not a nodev filesystem
+ if (bb_strlen(filesystemType)) {
+ status = do_mount(blockDevice, directory, filesystemType,
+ flags | MS_MGC_VAL, string_flags,
+ useMtab, fakeIt, mtab_opts, mount_all);
+ if (status) {
+ break;
+ }
+ }
+
+ }
+ }
+ fclose(f);
+ } else {
+ read_proc = 1;
+ }
+
+ if (read_proc && !status) {
- // Add NULL termination to each line
- while (*filesystemType && *filesystemType != '\n')
- filesystemType++;
- *filesystemType = '\0';
+ f = bb_xfopen("/proc/filesystems", "r");
+ while (fgets(buf, sizeof(buf), f) != NULL) {
filesystemType = buf;
- filesystemType++; // hop past tab
+ if (*filesystemType == '\t') { /* Not a nodev filesystem */
- status = do_mount(blockDevice, directory, filesystemType,
- flags | MS_MGC_VAL, string_flags,
- useMtab, fakeIt, mtab_opts);
- if (status == TRUE)
- break;
+ /* 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) {
+ break;
+ }
+ }
}
+ fclose(f);
}
- 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;
-
- /* open device */
- fd = open(device, O_RDONLY);
- if (fd < 0)
- fatalError("open failed for `%s': %s\n", device, strerror (errno));
-
- /* How many filesystems? We need to know to allocate enough space */
- numfilesystems = ioctl (fd, DEVMTAB_COUNT_FILESYSTEMS);
- if (numfilesystems<0)
- fatalError("\nDEVMTAB_COUNT_FILESYSTEMS: %s\n", strerror (errno));
- fslist = (struct k_fstype *) calloc ( numfilesystems, sizeof(struct k_fstype));
-
- /* Grab the list of available filesystems */
- status = ioctl (fd, DEVMTAB_GET_FILESYSTEMS, fslist);
- if (status<0)
- fatalError("\nDEVMTAB_GET_FILESYSTEMS: %s\n", strerror (errno));
-
- /* 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
- {
+ } else {
status = do_mount(blockDevice, directory, filesystemType,
- flags | MS_MGC_VAL, string_flags, useMtab,
- fakeIt, mtab_opts);
+ flags | MS_MGC_VAL, string_flags, useMtab, fakeIt,
+ mtab_opts, mount_all);
}
- if (status == FALSE) {
- if (whineOnErrors == TRUE) {
- fprintf(stderr, "Mounting %s on %s failed: %s\n",
- blockDevice, directory, strerror(errno));
+ if (!status) {
+ if (whineOnErrors) {
+ bb_perror_msg("Mounting %s on %s failed", blockDevice, directory);
}
return (FALSE);
}
return (TRUE);
}
-extern int mount_main(int argc, char **argv)
+static void show_mounts(char *onlytype)
{
- char string_flags_buf[1024] = "";
- char *string_flags = string_flags_buf;
- char *extra_opts = string_flags_buf;
- unsigned long flags = 0;
- char *filesystemType = "auto";
- char *device = NULL;
- char *directory = NULL;
- int all = FALSE;
- int fakeIt = FALSE;
- int useMtab = TRUE;
- int i;
-
-#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)
- fatalError("open failed for `%s': %s\n", device, strerror (errno));
-
- /* How many mounted filesystems? We need to know to
- * allocate enough space for later... */
- numfilesystems = ioctl (fd, DEVMTAB_COUNT_MOUNTS);
- if (numfilesystems<0)
- fatalError( "\nDEVMTAB_COUNT_MOUNTS: %s\n", strerror (errno));
- mntentlist = (struct k_mntent *) calloc ( numfilesystems, sizeof(struct k_mntent));
-
- /* Grab the list of mounted filesystems */
- if (ioctl (fd, DEVMTAB_GET_MOUNTS, mntentlist)<0)
- fatalError( "\nDEVMTAB_GET_MOUNTS: %s\n", strerror (errno));
-
- for( i = 0 ; i < numfilesystems ; i++) {
- fprintf( stdout, "%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);
- }
- /* Don't bother to close files or free memory. Exit
- * does that automagically, so we can save a few bytes */
-#if 0
- free( mntentlist);
- close(fd);
-#endif
- exit(TRUE);
- }
-#else
- if (argc == 1) {
- FILE *mountTable = setmntent(mtab_file, "r");
+ FILE *mountTable = setmntent(bb_path_mtab_file, "r");
- if (mountTable) {
- struct mntent *m;
+ 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);
- }
+ while ((m = getmntent(mountTable)) != 0) {
+ char *blockDevice = m->mnt_fsname;
+
+ if (strcmp(blockDevice, "rootfs") == 0) {
+ continue;
+ } else if (strcmp(blockDevice, "/dev/root") == 0) {
+ blockDevice = find_real_root_device_name();
+ }
+ if (!onlytype || (strcmp(m->mnt_type, onlytype) == 0)) {
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 CONFIG_FEATURE_CLEAN_UP
+ if (blockDevice != m->mnt_fsname) {
+ free(blockDevice);
+ }
+#endif
}
- exit(TRUE);
+ endmntent(mountTable);
+ } else {
+ bb_perror_msg_and_die(bb_path_mtab_file);
}
-#endif
+ exit(EXIT_SUCCESS);
+}
+
+extern int mount_main(int argc, char **argv)
+{
+ struct stat statbuf;
+ char *string_flags = bb_xstrdup("");
+ char *extra_opts;
+ int flags = 0;
+ char *filesystemType = "auto";
+ int got_filesystemType = 0;
+ char *device = xmalloc(PATH_MAX);
+ char *directory = xmalloc(PATH_MAX);
+ struct mntent *m = NULL;
+ int all = FALSE;
+ int fakeIt = FALSE;
+ int useMtab = TRUE;
+ int rc = EXIT_FAILURE;
+ FILE *f = 0;
+ int opt;
/* 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 'n':
- useMtab = FALSE;
- break;
+ while ((opt = getopt(argc, argv, "o:rt:wafnv")) > 0) {
+ switch (opt) {
+ case 'o':
+ parse_mount_options(optarg, &flags, &string_flags);
+ break;
+ case 'r':
+ flags |= MS_RDONLY;
+ break;
+ case 't':
+ filesystemType = optarg;
+ got_filesystemType = 1;
+ break;
+ case 'w':
+ flags &= ~MS_RDONLY;
+ break;
+ case 'a':
+ all = TRUE;
+ break;
+ case 'f':
+ fakeIt = TRUE;
+ break;
+ case 'n':
+#ifdef CONFIG_FEATURE_MTAB_SUPPORT
+ useMtab = FALSE;
#endif
- case 'v':
- break; /* ignore -v */
- case 'h':
- case '-':
- goto goodbye;
- }
+ break;
+ case 'v':
+ break; /* ignore -v */
+ }
+ }
+
+ if (!all && (optind == argc)) {
+ show_mounts(got_filesystemType ? filesystemType : NULL);
+ }
+
+ if (optind < argc) {
+ /* if device is a filename get its real path */
+ if (stat(argv[optind], &statbuf) == 0) {
+ char *tmp = bb_simplify_path(argv[optind]);
+
+ safe_strncpy(device, tmp, PATH_MAX);
} else {
- if (device == NULL)
- device = *argv;
- else if (directory == NULL)
- directory = *argv;
- else {
- goto goodbye;
- }
+ safe_strncpy(device, argv[optind], PATH_MAX);
}
- i--;
- argv++;
}
- if (all == TRUE) {
- struct mntent *m;
- FILE *f = setmntent("/etc/fstab", "r");
+ if (optind + 1 < argc)
+ directory = bb_simplify_path(argv[optind + 1]);
+
+ if (all || optind + 1 == argc) {
+ f = setmntent("/etc/fstab", "r");
if (f == NULL)
- fatalError( "\nCannot read /etc/fstab: %s\n", strerror (errno));
+ bb_perror_msg_and_die("\nCannot read /etc/fstab");
while ((m = getmntent(f)) != NULL) {
- // If the filesystem isn't noauto,
- // and isn't swap or nfs, then mount it
- if ((!strstr(m->mnt_opts, "noauto")) &&
- (!strstr(m->mnt_type, "swap")) &&
- (!strstr(m->mnt_type, "nfs"))) {
+ if (!all && (optind + 1 == argc)
+ && ((strcmp(device, m->mnt_fsname) != 0)
+ && (strcmp(device, m->mnt_dir) != 0))) {
+ continue;
+ }
+
+ if (all && ( /* 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, then mount it */
+ {
+ continue;
+ }
+
+ if (all || flags == 0) { /* Allow single mount to override fstab flags */
flags = 0;
- *string_flags = '\0';
- parse_mount_options(m->mnt_opts, &flags, string_flags);
- if (mount_one(m->mnt_fsname, m->mnt_dir, m->mnt_type,
- flags, string_flags, useMtab, fakeIt,
- extra_opts, FALSE)==FALSE)
- {
- /* Try again, but this time try a remount */
- mount_one(m->mnt_fsname, m->mnt_dir, m->mnt_type,
- flags|MS_REMOUNT, string_flags, useMtab, fakeIt,
- extra_opts, TRUE);
- }
+ string_flags[0] = 0;
+ parse_mount_options(m->mnt_opts, &flags, &string_flags);
}
- }
- endmntent(f);
- } else {
- if (device && directory) {
-#ifdef BB_NFSMOUNT
- if (strchr(device, ':') != NULL)
+
+ strcpy(device, m->mnt_fsname);
+ strcpy(directory, m->mnt_dir);
+ filesystemType = bb_xstrdup(m->mnt_type);
+ singlemount:
+ extra_opts = string_flags;
+ rc = EXIT_SUCCESS;
+#ifdef CONFIG_NFSMOUNT
+ if (strchr(device, ':') != NULL) {
filesystemType = "nfs";
- if (strcmp(filesystemType, "nfs") == 0) {
- int ret;
- ret = nfsmount (device, directory, &flags,
- &extra_opts, &string_flags, 1);
- if (ret != 0)
- fatalError("nfsmount failed: %s\n", strerror(errno));
+ if (nfsmount
+ (device, directory, &flags, &extra_opts, &string_flags,
+ 1)) {
+ bb_perror_msg("nfsmount failed");
+ rc = EXIT_FAILURE;
+ }
}
#endif
- exit(mount_one(device, directory, filesystemType,
- flags, string_flags, useMtab, fakeIt,
- extra_opts, TRUE));
- } else {
- goto goodbye;
+ if (!mount_one
+ (device, directory, filesystemType, flags, string_flags,
+ useMtab, fakeIt, extra_opts, TRUE, all)) {
+ rc = EXIT_FAILURE;
+ }
+ if (!all) {
+ break;
+ }
+ }
+ if (f) {
+ endmntent(f);
+ }
+ if (!all && f && m == NULL) {
+ fprintf(stderr, "Can't find %s in /etc/fstab\n", device);
}
+ return rc;
}
- exit(TRUE);
- goodbye:
- usage(mount_usage);
+ goto singlemount;
}
projects / oweals / busybox.git / blobdiff