*
* 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 <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
-#if defined BB_FEATURE_MOUNT_LOOP
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <linux/loop.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 */
-static int use_loop = FALSE;
-#endif
-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"
-#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"
#if defined BB_FEATURE_MOUNT_LOOP
- "\tloop: Mounts a file via loop device.\n"
+#include <fcntl.h>
+#include <sys/ioctl.h>
+static int use_loop = FALSE;
#endif
- "\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;
static const struct mount_options mount_options[] = {
{"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},
int status = 0;
char *lofile = NULL;
-#if defined BB_MTAB
if (fakeIt == FALSE)
-#endif
{
#if defined BB_FEATURE_MOUNT_LOOP
if (use_loop==TRUE) {
specialfile = find_unused_loop_device();
if (specialfile == NULL) {
- fprintf(stderr, "Could not find a spare loop device\n");
+ errorMsg("Could not find a spare loop device\n");
return (FALSE);
}
if (set_loop(specialfile, lofile, 0, &loro)) {
- fprintf(stderr, "Could not setup loop device\n");
+ errorMsg("Could not setup loop device\n");
return (FALSE);
}
if (!(flags & MS_RDONLY) && loro) { /* loop is ro, but wanted rw */
- fprintf(stderr, "WARNING: loop device is read-only\n");
+ errorMsg("WARNING: loop device is read-only\n");
flags &= ~MS_RDONLY;
}
- use_loop = FALSE;
}
#endif
- status =
- mount(specialfile, dir, filesystemtype, flags, string_flags);
+ status = mount(specialfile, dir, filesystemtype, flags, string_flags);
+ if (errno == EROFS) {
+ errorMsg("%s is write-protected, mounting read-only\n", specialfile);
+ status = mount(specialfile, dir, filesystemtype, flags |= MS_RDONLY, string_flags);
+ }
}
/* 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) {
+ erase_mtab(specialfile); // Clean any stale entries
write_mtab(specialfile, dir, filesystemtype, flags, mtab_opts);
}
#endif
del_loop(specialfile);
}
#endif
+
+ if (errno == EPERM) {
+ fatalError("permission denied. Are you root?\n");
+ }
+
return (FALSE);
}
/* Seperate standard mount options from the nonstandard string options */
static void
-parse_mount_options(char *options, unsigned long *flags, char *strflags)
+parse_mount_options(char *options, int *flags, char *strflags)
{
while (options) {
int gotone = FALSE;
{
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");
}
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 *) xcalloc ( 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
{
status = do_mount(blockDevice, directory, filesystemType,
fakeIt, mtab_opts);
}
- if (status == FALSE && whineOnErrors == TRUE) {
+ if (status == FALSE) {
if (whineOnErrors == TRUE) {
- fprintf(stderr, "Mounting %s on %s failed: %s\n",
+ errorMsg("Mounting %s on %s failed: %s\n",
blockDevice, directory, strerror(errno));
}
return (FALSE);
char string_flags_buf[1024] = "";
char *string_flags = string_flags_buf;
char *extra_opts = string_flags_buf;
- unsigned long flags = 0;
+ int flags = 0;
char *filesystemType = "auto";
char *device = NULL;
char *directory = NULL;
int fakeIt = FALSE;
int useMtab = TRUE;
int i;
+ int rc = FALSE;
+ int fstabmount = FALSE;
- /* Only compiled in if BB_MTAB is not defined */
- whine_if_fstab_is_missing();
-
+#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 *) xcalloc ( 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);
+ }
+#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
+ exit(TRUE);
+ }
+#else
if (argc == 1) {
FILE *mountTable = setmntent(mtab_file, "r");
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;
+ find_real_root_device_name( blockDevice);
}
printf("%s on %s type %s (%s)\n", blockDevice, m->mnt_dir,
m->mnt_type, m->mnt_opts);
}
exit(TRUE);
}
-
+#endif
/* Parse options */
i = --argc;
case 'a':
all = TRUE;
break;
-#ifdef BB_MTAB
case 'f':
fakeIt = TRUE;
break;
+#ifdef BB_MTAB
case 'n':
useMtab = FALSE;
break;
#endif
case 'v':
+ break; /* ignore -v */
case 'h':
case '-':
goto goodbye;
argv++;
}
- if (all == TRUE) {
+ if (all == TRUE || directory == NULL) {
struct mntent *m;
FILE *f = setmntent("/etc/fstab", "r");
+ fstabmount = TRUE;
+
+ if (f == NULL)
+ fatalError( "\nCannot read /etc/fstab: %s\n", strerror (errno));
- if (f == NULL) {
- perror("/etc/fstab");
- exit(FALSE);
- }
while ((m = getmntent(f)) != NULL) {
- // If the file system 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 == 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);
- /* If the directory is /, try to remount
- * with the options specified in fstab */
- if (m->mnt_dir[0] == '/' && m->mnt_dir[1] == '\0') {
- flags |= MS_REMOUNT;
- }
- if (mount_one(m->mnt_fsname, m->mnt_dir, m->mnt_type,
- flags, string_flags, useMtab, fakeIt,
- extra_opts, 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);
- }
}
- }
- endmntent(f);
- } else {
- if (device && directory) {
+
+ device = strdup(m->mnt_fsname);
+ directory = strdup(m->mnt_dir);
+ filesystemType = strdup(m->mnt_type);
+singlemount:
#ifdef BB_NFSMOUNT
+ if (strchr(device, ':') != NULL)
+ filesystemType = "nfs";
if (strcmp(filesystemType, "nfs") == 0) {
- if (nfsmount
- (device, directory, &flags, &extra_opts, &string_flags,
- 1) != 0)
- exit(FALSE);
+ rc = nfsmount (device, directory, &flags,
+ &extra_opts, &string_flags, 1);
+ if ( rc != 0) {
+ fatalError("nfsmount failed: %s\n", strerror(errno));
+ rc = FALSE;
+ }
}
#endif
- exit(mount_one(device, directory, filesystemType,
- flags, string_flags, useMtab, fakeIt,
- extra_opts, TRUE));
- } else {
- goto goodbye;
+ rc = mount_one(device, directory, filesystemType, flags,
+ string_flags, useMtab, fakeIt, extra_opts, TRUE);
+
+ if (all == FALSE)
+ break;
+
+ rc = TRUE; // Always return 0 for 'all'
}
+ 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);
}
- exit(TRUE);
+
+ goto singlemount;
+
+ exit(FALSE);
- goodbye:
+goodbye:
usage(mount_usage);
}
projects / oweals / busybox.git / blobdiff