* Mini mount implementation for busybox
*
* Copyright (C) 1995, 1996 by Bruce Perens <bruce@pixar.com>.
- * Copyright (C) 1999-2002 by Erik Andersen <andersee@debian.org>
+ * 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 <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.
* 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.
- *
+ * mtab updating and stale entries. Removed 'remount' default.
+ *
*/
#include <limits.h>
#include <mntent.h>
#include <ctype.h>
#include "busybox.h"
-#if defined CONFIG_FEATURE_USE_DEVPS_PATCH
-# include <linux/devmtab.h> /* For Erik's nifty devmtab device driver */
+
+#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_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 */
};
extern int sysfs(int option, unsigned int fs_index, char *buf);
-extern const char mtab_file[]; /* Defined in utility.c */
-
struct mount_options {
const char *name;
unsigned long and;
{"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, int mount_all)
+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;
specialfile = find_unused_loop_device();
if (specialfile == NULL) {
- error_msg_and_die("Could not find a spare loop device");
+ bb_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");
+ bb_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");
+ 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) {
- error_msg("%s is write-protected, mounting read-only",
+ 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)
+ if (status < 0 && errno == EBUSY && mount_all) {
return TRUE;
+ }
}
#endif
if (errno == EPERM) {
- error_msg_and_die("permission denied. Are you root?");
+ bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
}
return (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) {
}
#endif
if (!gotone) {
- if (**strflags) /* have previous parsed options */
+ if (**strflags) {
+ /* have previous parsed options */
paste_str(strflags, ",");
+ }
paste_str(strflags, options);
}
if (comma) {
}
}
-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)
+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 CONFIG_FEATURE_USE_DEVPS_PATCH
- if (strcmp(filesystemType, "auto") == 0) {
- static const char *noauto_array[] =
- { "tmpfs", "shm", "proc", "ramfs", "devpts", "devfs", "usbdevfs",
-0 };
- const char **noauto_fstype;
- const int num_of_filesystems = sysfs(3, 0, 0);
- char buf[255];
- int i = 0;
-
- filesystemType = buf;
-
- while (i < num_of_filesystems) {
- sysfs(2, i++, filesystemType);
- for (noauto_fstype = noauto_array; *noauto_fstype;
- noauto_fstype++) {
- if (!strcmp(filesystemType, *noauto_fstype)) {
- break;
- }
- }
- if (!*noauto_fstype) {
- status = do_mount(blockDevice, directory, filesystemType,
- flags | MS_MGC_VAL, string_flags,
- useMtab, fakeIt, mtab_opts, mount_all);
- if (status)
- break;
- }
- }
- }
-#else
if (strcmp(filesystemType, "auto") == 0) {
char buf[255];
FILE *f;
if (f) {
while (fgets(buf, sizeof(buf), f)) {
- if (*buf == '*')
+ if (*buf == '*') {
read_proc = 1;
- else if (*buf == '#')
+ } else if (*buf == '#') {
continue;
- else {
+ } else {
filesystemType = buf;
/* Add NULL termination to each line */
- while (*filesystemType && !isspace(*filesystemType))
+ while (*filesystemType && !isspace(*filesystemType)) {
filesystemType++;
+ }
*filesystemType = '\0';
filesystemType = buf;
- if (xstrlen(filesystemType)) {
- status =
- do_mount(blockDevice, directory, filesystemType,
+ if (bb_strlen(filesystemType)) {
+ status = do_mount(blockDevice, directory, filesystemType,
flags | MS_MGC_VAL, string_flags,
useMtab, fakeIt, mtab_opts, mount_all);
- if (status)
+ if (status) {
break;
+ }
}
}
}
fclose(f);
+ } else {
+ read_proc = 1;
}
- if ((!f || read_proc) && !status) {
- f = xfopen("/proc/filesystems", "r");
+ if (read_proc && !status) {
+
+ f = bb_xfopen("/proc/filesystems", "r");
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')
+ 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)
+ flags | MS_MGC_VAL, string_flags, useMtab,
+ fakeIt, mtab_opts, mount_all);
+ if (status) {
break;
+ }
}
}
+ fclose(f);
}
- fclose(f);
- }
-#endif
- else {
+ } else {
status = do_mount(blockDevice, directory, filesystemType,
- flags | MS_MGC_VAL, string_flags, useMtab,
- fakeIt, mtab_opts, mount_all);
+ flags | MS_MGC_VAL, string_flags, useMtab, fakeIt,
+ mtab_opts, mount_all);
}
if (!status) {
if (whineOnErrors) {
- perror_msg("Mounting %s on %s failed", blockDevice, directory);
+ bb_perror_msg("Mounting %s on %s failed", blockDevice, directory);
}
return (FALSE);
}
static void show_mounts(char *onlytype)
{
-#if defined CONFIG_FEATURE_USE_DEVPS_PATCH
- 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++) {
- if (!onlytype || (strcmp(mntentlist[i].mnt_type, onlytype) == 0)) {
- 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);
- }
- }
-#ifdef CONFIG_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(EXIT_SUCCESS);
-#else
- FILE *mountTable = setmntent(mtab_file, "r");
+ FILE *mountTable = setmntent(bb_path_mtab_file, "r");
if (mountTable) {
struct mntent *m;
while ((m = getmntent(mountTable)) != 0) {
char *blockDevice = m->mnt_fsname;
- if (strcmp(blockDevice, "/dev/root") == 0) {
- blockDevice = find_real_root_device_name(blockDevice);
+ 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);
}
#ifdef CONFIG_FEATURE_CLEAN_UP
- if (blockDevice != m->mnt_fsname)
+ if (blockDevice != m->mnt_fsname) {
free(blockDevice);
+ }
#endif
}
endmntent(mountTable);
} else {
- perror_msg_and_die("%s", mtab_file);
+ bb_perror_msg_and_die(bb_path_mtab_file);
}
exit(EXIT_SUCCESS);
-#endif
}
extern int mount_main(int argc, char **argv)
{
struct stat statbuf;
- char *string_flags = xstrdup("");
+ char *string_flags = bb_xstrdup("");
char *extra_opts;
int flags = 0;
char *filesystemType = "auto";
case 'f':
fakeIt = TRUE;
break;
-#ifdef CONFIG_FEATURE_MTAB_SUPPORT
case 'n':
+#ifdef CONFIG_FEATURE_MTAB_SUPPORT
useMtab = FALSE;
- break;
#endif
+ break;
case 'v':
break; /* ignore -v */
}
}
- if (!all && optind == argc)
- show_mounts(got_filesystemType ? filesystemType : 0);
+ 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 = simplify_path(argv[optind]);
+ char *tmp = bb_simplify_path(argv[optind]);
safe_strncpy(device, tmp, PATH_MAX);
} else {
}
if (optind + 1 < argc)
- directory = simplify_path(argv[optind + 1]);
+ directory = bb_simplify_path(argv[optind + 1]);
if (all || optind + 1 == argc) {
f = setmntent("/etc/fstab", "r");
if (f == NULL)
- perror_msg_and_die("\nCannot read /etc/fstab");
+ bb_perror_msg_and_die("\nCannot read /etc/fstab");
while ((m = getmntent(f)) != NULL) {
- if (!all && optind + 1 == argc && ((strcmp(device, m->mnt_fsname)
- != 0)
- && (strcmp(device, m->mnt_dir)
- != 0))) {
+ 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 or nfs, then mount it */
- (strstr(m->mnt_type, "nfs")))) {
+ (strstr(m->mnt_type, "swap")))) /* and isn't swap, then mount it */
+ {
continue;
}
strcpy(device, m->mnt_fsname);
strcpy(directory, m->mnt_dir);
- filesystemType = xstrdup(m->mnt_type);
+ filesystemType = bb_xstrdup(m->mnt_type);
singlemount:
extra_opts = string_flags;
rc = EXIT_SUCCESS;
#ifdef CONFIG_NFSMOUNT
if (strchr(device, ':') != NULL) {
filesystemType = "nfs";
- if (nfsmount(device, directory, &flags, &extra_opts,
- &string_flags, 1)) {
- perror_msg("nfsmount failed");
+ if (nfsmount
+ (device, directory, &flags, &extra_opts, &string_flags,
+ 1)) {
+ bb_perror_msg("nfsmount failed");
rc = EXIT_FAILURE;
}
}
#endif
- if (!mount_one(device, directory, filesystemType, flags,
- string_flags, useMtab, fakeIt, extra_opts, TRUE,
- all))
+ if (!mount_one
+ (device, directory, filesystemType, flags, string_flags,
+ useMtab, fakeIt, extra_opts, TRUE, all)) {
rc = EXIT_FAILURE;
-
- if (!all)
+ }
+ if (!all) {
break;
+ }
}
- if (f)
+ if (f) {
endmntent(f);
-
- if (!all && f && m == NULL)
+ }
+ if (!all && f && m == NULL) {
fprintf(stderr, "Can't find %s in /etc/fstab\n", device);
-
+ }
return rc;
}