X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=mount.c;h=72734ae62380a73714eac98b488d7ef8cf8d52af;hb=9b2297a34e35be143155769a470331af2f2b9330;hp=c3e3bbd7542be5ae722e13db5654f2b98e4a870a;hpb=e49d5ecbbe51718fa925b6890a735e5937cc2aa2;p=oweals%2Fbusybox.git diff --git a/mount.c b/mount.c index c3e3bbd75..72734ae62 100644 --- a/mount.c +++ b/mount.c @@ -43,47 +43,73 @@ #include #include #include -#include #include -#include +#if defined BB_FEATURE_USE_DEVPS_PATCH +#include +#endif + + +#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 */ + + #if defined BB_FEATURE_MOUNT_LOOP #include #include -#include +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); -static int use_loop = 0; -#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" +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\"Fake\" mount. Add entry to mount table but don't mount it.\n" - "\t-n:\tDon't write a mount table entry.\n" + "\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:\tMount the filesystem read-only.\n" - "\t-t filesystem-type:\tSpecify the filesystem type.\n" - "\t-w:\tMount for reading and writing (default).\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" - "\tdev / nodev:\tAllow use of special device files / disallow them.\n" - "\texec / noexec:\tAllow use of executable files / disallow them.\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: Mounts a file via loop device.\n" + "\tloop:\t\tMounts a file via loop device.\n" #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"; + "\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 + ; struct mount_options { @@ -94,10 +120,14 @@ struct mount_options { 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}, @@ -114,13 +144,14 @@ do_mount(char *specialfile, char *dir, char *filesystemtype, char *mtab_opts) { int status = 0; + char *lofile = NULL; #if defined BB_MTAB if (fakeIt == FALSE) #endif { #if defined BB_FEATURE_MOUNT_LOOP - if (use_loop) { + if (use_loop==TRUE) { int loro = flags & MS_RDONLY; char *lofile = specialfile; @@ -139,8 +170,7 @@ do_mount(char *specialfile, char *dir, char *filesystemtype, } } #endif - status = - mount(specialfile, dir, filesystemtype, flags, string_flags); + status = mount(specialfile, dir, filesystemtype, flags, string_flags); } @@ -157,27 +187,18 @@ do_mount(char *specialfile, char *dir, char *filesystemtype, /* Bummer. mount failed. Clean up */ #if defined BB_FEATURE_MOUNT_LOOP - if (specialfile != NULL) { + if (lofile != NULL) { del_loop(specialfile); } #endif - return (FALSE); -} - + if (errno == EPERM) { + fatalError("mount: permission denied. Are you root?\n"); + } -#if defined BB_MTAB -#define whine_if_fstab_is_missing() {} -#else -extern void whine_if_fstab_is_missing() -{ - struct stat statBuf; - - if (stat("/etc/fstab", &statBuf) < 0) - fprintf(stderr, - "/etc/fstab file missing -- install one to name /dev/root.\n\n"); + return (FALSE); } -#endif + /* Seperate standard mount options from the nonstandard string options */ @@ -204,7 +225,7 @@ parse_mount_options(char *options, unsigned long *flags, char *strflags) } #if defined BB_FEATURE_MOUNT_LOOP if (gotone == FALSE && !strcasecmp("loop", options)) { /* loop device support */ - use_loop = 1; + use_loop = TRUE; gotone = TRUE; } #endif @@ -229,13 +250,12 @@ parse_mount_options(char *options, unsigned long *flags, char *strflags) int mount_one(char *blockDevice, char *directory, char *filesystemType, unsigned long flags, char *string_flags, int useMtab, int fakeIt, - char *mtab_opts) + char *mtab_opts, int whineOnErrors) { 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"); @@ -263,6 +283,43 @@ mount_one(char *blockDevice, char *directory, char *filesystemType, } 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 { status = do_mount(blockDevice, directory, filesystemType, @@ -271,8 +328,10 @@ mount_one(char *blockDevice, char *directory, char *filesystemType, } if (status == FALSE) { - fprintf(stderr, "Mounting %s on %s failed: %s\n", - blockDevice, directory, strerror(errno)); + if (whineOnErrors == TRUE) { + fprintf(stderr, "Mounting %s on %s failed: %s\n", + blockDevice, directory, strerror(errno)); + } return (FALSE); } return (TRUE); @@ -292,9 +351,43 @@ extern int mount_main(int argc, char **argv) int useMtab = TRUE; int i; - /* 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 *) 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"); @@ -302,14 +395,9 @@ extern int mount_main(int argc, char **argv) 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); @@ -320,7 +408,7 @@ extern int mount_main(int argc, char **argv) } exit(TRUE); } - +#endif /* Parse options */ i = --argc; @@ -352,15 +440,16 @@ extern int mount_main(int argc, char **argv) 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; @@ -382,39 +471,46 @@ extern int mount_main(int argc, char **argv) struct mntent *m; FILE *f = setmntent("/etc/fstab", "r"); - if (f == NULL) { - perror("/etc/fstab"); - exit(FALSE); - } + if (f == NULL) + fatalError( "\nCannot read /etc/fstab: %s\n", strerror (errno)); + while ((m = getmntent(f)) != NULL) { - // If the file system isn't noauto, and isn't mounted on /, + // If the filesystem isn't noauto, // 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"))) { + (!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, - extra_opts); + 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); + } } } endmntent(f); } else { if (device && directory) { #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); + int ret; + ret = nfsmount (device, directory, &flags, + &extra_opts, &string_flags, 1); + if (ret != 0) + fatalError("nfsmount failed: %s\n", strerror(errno)); } #endif exit(mount_one(device, directory, filesystemType, flags, string_flags, useMtab, fakeIt, - extra_opts)); + extra_opts, TRUE)); } else { goto goodbye; }