2000-02-09 01:28:47 +05:30
|
|
|
/* vi: set sw=4 ts=4: */
|
1999-10-05 21:54:54 +05:30
|
|
|
/*
|
1999-10-07 14:00:23 +05:30
|
|
|
* Mini mount implementation for busybox
|
|
|
|
*
|
1999-10-21 03:38:37 +05:30
|
|
|
* Copyright (C) 1995, 1996 by Bruce Perens <bruce@pixar.com>.
|
2004-03-15 13:59:22 +05:30
|
|
|
* Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
|
2006-03-14 23:46:25 +05:30
|
|
|
* Copyright (C) 2005-2006 by Rob Landley <rob@landley.net>
|
1999-10-07 14:00:23 +05:30
|
|
|
*
|
2010-08-16 23:44:46 +05:30
|
|
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
2000-01-13 12:08:14 +05:30
|
|
|
*/
|
2008-12-05 22:10:36 +05:30
|
|
|
// Design notes: There is no spec for mount. Remind me to write one.
|
|
|
|
//
|
|
|
|
// mount_main() calls singlemount() which calls mount_it_now().
|
|
|
|
//
|
|
|
|
// mount_main() can loop through /etc/fstab for mount -a
|
|
|
|
// singlemount() can loop through /etc/filesystems for fstype detection.
|
|
|
|
// mount_it_now() does the actual mount.
|
|
|
|
//
|
2011-04-11 06:59:49 +05:30
|
|
|
|
2015-03-11 20:37:24 +05:30
|
|
|
//config:config MOUNT
|
2018-12-28 07:50:17 +05:30
|
|
|
//config: bool "mount (23 kb)"
|
2015-03-11 20:37:24 +05:30
|
|
|
//config: default y
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: All files and filesystems in Unix are arranged into one big directory
|
|
|
|
//config: tree. The 'mount' utility is used to graft a filesystem onto a
|
|
|
|
//config: particular part of the tree. A filesystem can either live on a block
|
|
|
|
//config: device, or it can be accessible over the network, as is the case with
|
2017-07-27 14:23:09 +05:30
|
|
|
//config: NFS filesystems.
|
2015-03-11 20:37:24 +05:30
|
|
|
//config:
|
|
|
|
//config:config FEATURE_MOUNT_FAKE
|
2017-07-27 18:15:25 +05:30
|
|
|
//config: bool "Support -f (fake mount)"
|
2015-03-11 20:37:24 +05:30
|
|
|
//config: default y
|
|
|
|
//config: depends on MOUNT
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: Enable support for faking a file system mount.
|
2015-03-11 20:37:24 +05:30
|
|
|
//config:
|
|
|
|
//config:config FEATURE_MOUNT_VERBOSE
|
2017-07-27 18:15:25 +05:30
|
|
|
//config: bool "Support -v (verbose)"
|
2015-03-11 20:37:24 +05:30
|
|
|
//config: default y
|
|
|
|
//config: depends on MOUNT
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: Enable multi-level -v[vv...] verbose messages. Useful if you
|
|
|
|
//config: debug mount problems and want to see what is exactly passed
|
|
|
|
//config: to the kernel.
|
2015-03-11 20:37:24 +05:30
|
|
|
//config:
|
|
|
|
//config:config FEATURE_MOUNT_HELPERS
|
|
|
|
//config: bool "Support mount helpers"
|
|
|
|
//config: default n
|
|
|
|
//config: depends on MOUNT
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: Enable mounting of virtual file systems via external helpers.
|
|
|
|
//config: E.g. "mount obexfs#-b00.11.22.33.44.55 /mnt" will in effect call
|
|
|
|
//config: "obexfs -b00.11.22.33.44.55 /mnt"
|
|
|
|
//config: Also "mount -t sometype [-o opts] fs /mnt" will try
|
|
|
|
//config: "sometype [-o opts] fs /mnt" if simple mount syscall fails.
|
|
|
|
//config: The idea is to use such virtual filesystems in /etc/fstab.
|
2015-03-11 20:37:24 +05:30
|
|
|
//config:
|
|
|
|
//config:config FEATURE_MOUNT_LABEL
|
|
|
|
//config: bool "Support specifying devices by label or UUID"
|
|
|
|
//config: default y
|
|
|
|
//config: depends on MOUNT
|
|
|
|
//config: select VOLUMEID
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: This allows for specifying a device by label or uuid, rather than by
|
|
|
|
//config: name. This feature utilizes the same functionality as blkid/findfs.
|
2015-03-11 20:37:24 +05:30
|
|
|
//config:
|
|
|
|
//config:config FEATURE_MOUNT_NFS
|
|
|
|
//config: bool "Support mounting NFS file systems on Linux < 2.6.23"
|
|
|
|
//config: default n
|
|
|
|
//config: depends on MOUNT
|
|
|
|
//config: select FEATURE_SYSLOG
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: Enable mounting of NFS file systems on Linux kernels prior
|
|
|
|
//config: to version 2.6.23. Note that in this case mounting of NFS
|
|
|
|
//config: over IPv6 will not be possible.
|
2015-03-11 20:37:24 +05:30
|
|
|
//config:
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: Note that this option links in RPC support from libc,
|
|
|
|
//config: which is rather large (~10 kbytes on uclibc).
|
2015-03-11 20:37:24 +05:30
|
|
|
//config:
|
|
|
|
//config:config FEATURE_MOUNT_CIFS
|
|
|
|
//config: bool "Support mounting CIFS/SMB file systems"
|
|
|
|
//config: default y
|
|
|
|
//config: depends on MOUNT
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: Enable support for samba mounts.
|
2015-03-11 20:37:24 +05:30
|
|
|
//config:
|
|
|
|
//config:config FEATURE_MOUNT_FLAGS
|
|
|
|
//config: depends on MOUNT
|
2017-01-10 19:28:54 +05:30
|
|
|
//config: bool "Support lots of -o flags"
|
2015-03-11 20:37:24 +05:30
|
|
|
//config: default y
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: Without this, mount only supports ro/rw/remount. With this, it
|
|
|
|
//config: supports nosuid, suid, dev, nodev, exec, noexec, sync, async, atime,
|
|
|
|
//config: noatime, diratime, nodiratime, loud, bind, move, shared, slave,
|
|
|
|
//config: private, unbindable, rshared, rslave, rprivate, and runbindable.
|
2015-03-11 20:37:24 +05:30
|
|
|
//config:
|
|
|
|
//config:config FEATURE_MOUNT_FSTAB
|
|
|
|
//config: depends on MOUNT
|
2017-07-27 18:15:25 +05:30
|
|
|
//config: bool "Support /etc/fstab and -a (mount all)"
|
2015-03-11 20:37:24 +05:30
|
|
|
//config: default y
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: Support mount all and looking for files in /etc/fstab.
|
2015-03-11 20:37:24 +05:30
|
|
|
//config:
|
|
|
|
//config:config FEATURE_MOUNT_OTHERTAB
|
|
|
|
//config: depends on FEATURE_MOUNT_FSTAB
|
|
|
|
//config: bool "Support -T <alt_fstab>"
|
|
|
|
//config: default y
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: Support mount -T (specifying an alternate fstab)
|
2015-03-11 20:37:24 +05:30
|
|
|
|
2016-11-23 16:16:32 +05:30
|
|
|
/* On full-blown systems, requires suid for user mounts.
|
|
|
|
* But it's not unthinkable to have it available in non-suid flavor on some systems,
|
|
|
|
* for viewing mount table.
|
|
|
|
* Therefore we use BB_SUID_MAYBE instead of BB_SUID_REQUIRE: */
|
|
|
|
//applet:IF_MOUNT(APPLET(mount, BB_DIR_BIN, IF_DESKTOP(BB_SUID_MAYBE) IF_NOT_DESKTOP(BB_SUID_DROP)))
|
|
|
|
|
|
|
|
//kbuild:lib-$(CONFIG_MOUNT) += mount.o
|
|
|
|
|
2011-04-11 06:59:49 +05:30
|
|
|
//usage:#define mount_trivial_usage
|
2015-03-11 20:37:24 +05:30
|
|
|
//usage: "[OPTIONS] [-o OPT] DEVICE NODE"
|
2011-04-11 06:59:49 +05:30
|
|
|
//usage:#define mount_full_usage "\n\n"
|
|
|
|
//usage: "Mount a filesystem. Filesystem autodetection requires /proc.\n"
|
|
|
|
//usage: "\n -a Mount all filesystems in fstab"
|
|
|
|
//usage: IF_FEATURE_MOUNT_FAKE(
|
|
|
|
//usage: IF_FEATURE_MTAB_SUPPORT(
|
|
|
|
//usage: "\n -f Update /etc/mtab, but don't mount"
|
|
|
|
//usage: )
|
|
|
|
//usage: IF_NOT_FEATURE_MTAB_SUPPORT(
|
|
|
|
//usage: "\n -f Dry run"
|
|
|
|
//usage: )
|
|
|
|
//usage: )
|
|
|
|
//usage: IF_FEATURE_MOUNT_HELPERS(
|
|
|
|
//usage: "\n -i Don't run mount helper"
|
|
|
|
//usage: )
|
|
|
|
//usage: IF_FEATURE_MTAB_SUPPORT(
|
|
|
|
//usage: "\n -n Don't update /etc/mtab"
|
|
|
|
//usage: )
|
2013-01-17 07:00:35 +05:30
|
|
|
//usage: IF_FEATURE_MOUNT_VERBOSE(
|
|
|
|
//usage: "\n -v Verbose"
|
|
|
|
//usage: )
|
|
|
|
////usage: "\n -s Sloppy (ignored)"
|
2011-04-11 06:59:49 +05:30
|
|
|
//usage: "\n -r Read-only mount"
|
2015-03-11 20:37:24 +05:30
|
|
|
////usage: "\n -w Read-write mount (default)"
|
2011-11-03 14:32:31 +05:30
|
|
|
//usage: "\n -t FSTYPE[,...] Filesystem type(s)"
|
2015-03-11 20:37:24 +05:30
|
|
|
//usage: IF_FEATURE_MOUNT_OTHERTAB(
|
|
|
|
//usage: "\n -T FILE Read FILE instead of /etc/fstab"
|
|
|
|
//usage: )
|
2011-04-11 06:59:49 +05:30
|
|
|
//usage: "\n -O OPT Mount only filesystems with option OPT (-a only)"
|
|
|
|
//usage: "\n-o OPT:"
|
|
|
|
//usage: IF_FEATURE_MOUNT_LOOP(
|
|
|
|
//usage: "\n loop Ignored (loop devices are autodetected)"
|
|
|
|
//usage: )
|
|
|
|
//usage: IF_FEATURE_MOUNT_FLAGS(
|
|
|
|
//usage: "\n [a]sync Writes are [a]synchronous"
|
|
|
|
//usage: "\n [no]atime Disable/enable updates to inode access times"
|
|
|
|
//usage: "\n [no]diratime Disable/enable atime updates to directories"
|
|
|
|
//usage: "\n [no]relatime Disable/enable atime updates relative to modification time"
|
|
|
|
//usage: "\n [no]dev (Dis)allow use of special device files"
|
|
|
|
//usage: "\n [no]exec (Dis)allow use of executable files"
|
|
|
|
//usage: "\n [no]suid (Dis)allow set-user-id-root programs"
|
|
|
|
//usage: "\n [r]shared Convert [recursively] to a shared subtree"
|
|
|
|
//usage: "\n [r]slave Convert [recursively] to a slave subtree"
|
|
|
|
//usage: "\n [r]private Convert [recursively] to a private subtree"
|
|
|
|
//usage: "\n [un]bindable Make mount point [un]able to be bind mounted"
|
|
|
|
//usage: "\n [r]bind Bind a file or directory [recursively] to another location"
|
|
|
|
//usage: "\n move Relocate an existing mount point"
|
|
|
|
//usage: )
|
|
|
|
//usage: "\n remount Remount a mounted filesystem, changing flags"
|
2015-03-11 20:37:24 +05:30
|
|
|
//usage: "\n ro Same as -r"
|
2011-04-11 06:59:49 +05:30
|
|
|
//usage: "\n"
|
|
|
|
//usage: "\nThere are filesystem-specific -o flags."
|
|
|
|
//usage:
|
|
|
|
//usage:#define mount_example_usage
|
|
|
|
//usage: "$ mount\n"
|
|
|
|
//usage: "/dev/hda3 on / type minix (rw)\n"
|
|
|
|
//usage: "proc on /proc type proc (rw)\n"
|
|
|
|
//usage: "devpts on /dev/pts type devpts (rw)\n"
|
|
|
|
//usage: "$ mount /dev/fd0 /mnt -t msdos -o ro\n"
|
|
|
|
//usage: "$ mount /tmp/diskimage /opt -t ext2 -o loop\n"
|
|
|
|
//usage: "$ mount cd_image.iso mydir\n"
|
|
|
|
//usage:#define mount_notes_usage
|
|
|
|
//usage: "Returns 0 for success, number of failed mounts for -a, or errno for one mount."
|
|
|
|
|
1999-10-05 21:54:54 +05:30
|
|
|
#include <mntent.h>
|
2008-01-27 18:20:12 +05:30
|
|
|
#include <syslog.h>
|
2009-07-08 06:28:38 +05:30
|
|
|
#include <sys/mount.h>
|
2009-11-21 21:44:08 +05:30
|
|
|
// Grab more as needed from util-linux's mount/mount_constants.h
|
|
|
|
#ifndef MS_DIRSYNC
|
|
|
|
# define MS_DIRSYNC (1 << 7) // Directory modifications are synchronous
|
|
|
|
#endif
|
2009-10-05 05:48:01 +05:30
|
|
|
#ifndef MS_UNION
|
|
|
|
# define MS_UNION (1 << 8)
|
|
|
|
#endif
|
2009-07-08 06:28:38 +05:30
|
|
|
#ifndef MS_BIND
|
|
|
|
# define MS_BIND (1 << 12)
|
|
|
|
#endif
|
|
|
|
#ifndef MS_MOVE
|
|
|
|
# define MS_MOVE (1 << 13)
|
|
|
|
#endif
|
|
|
|
#ifndef MS_RECURSIVE
|
|
|
|
# define MS_RECURSIVE (1 << 14)
|
|
|
|
#endif
|
|
|
|
#ifndef MS_SILENT
|
|
|
|
# define MS_SILENT (1 << 15)
|
|
|
|
#endif
|
2009-11-21 21:44:08 +05:30
|
|
|
// The shared subtree stuff, which went in around 2.6.15
|
2009-07-08 06:28:38 +05:30
|
|
|
#ifndef MS_UNBINDABLE
|
|
|
|
# define MS_UNBINDABLE (1 << 17)
|
|
|
|
#endif
|
|
|
|
#ifndef MS_PRIVATE
|
|
|
|
# define MS_PRIVATE (1 << 18)
|
|
|
|
#endif
|
|
|
|
#ifndef MS_SLAVE
|
|
|
|
# define MS_SLAVE (1 << 19)
|
|
|
|
#endif
|
|
|
|
#ifndef MS_SHARED
|
|
|
|
# define MS_SHARED (1 << 20)
|
|
|
|
#endif
|
|
|
|
#ifndef MS_RELATIME
|
|
|
|
# define MS_RELATIME (1 << 21)
|
|
|
|
#endif
|
2012-06-26 19:39:00 +05:30
|
|
|
#ifndef MS_STRICTATIME
|
|
|
|
# define MS_STRICTATIME (1 << 24)
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Any ~MS_FOO value has this bit set: */
|
|
|
|
#define BB_MS_INVERTED_VALUE (1u << 31)
|
2000-07-09 00:25:24 +05:30
|
|
|
|
2009-11-21 21:44:08 +05:30
|
|
|
#include "libbb.h"
|
2016-04-21 19:56:30 +05:30
|
|
|
#include "common_bufsiz.h"
|
2008-03-18 07:14:52 +05:30
|
|
|
#if ENABLE_FEATURE_MOUNT_LABEL
|
2009-09-20 07:58:22 +05:30
|
|
|
# include "volume_id.h"
|
|
|
|
#else
|
|
|
|
# define resolve_mount_spec(fsname) ((void)0)
|
2008-03-18 07:14:52 +05:30
|
|
|
#endif
|
2008-02-19 02:38:49 +05:30
|
|
|
|
2008-12-05 22:10:36 +05:30
|
|
|
// Needed for nfs support only
|
2006-09-15 20:42:00 +05:30
|
|
|
#include <sys/utsname.h>
|
|
|
|
#undef TRUE
|
|
|
|
#undef FALSE
|
2009-12-16 06:36:56 +05:30
|
|
|
#if ENABLE_FEATURE_MOUNT_NFS
|
|
|
|
/* This is just a warning of a common mistake. Possibly this should be a
|
|
|
|
* uclibc faq entry rather than in busybox... */
|
|
|
|
# if defined(__UCLIBC__) && ! defined(__UCLIBC_HAS_RPC__)
|
2017-07-10 18:13:22 +05:30
|
|
|
# warning "You probably need to build uClibc with UCLIBC_HAS_RPC for NFS support"
|
2018-02-13 22:50:28 +05:30
|
|
|
/* not #error, since user may be using e.g. libtirpc instead.
|
|
|
|
* This might work:
|
|
|
|
* CONFIG_EXTRA_CFLAGS="-I/usr/include/tirpc"
|
|
|
|
* CONFIG_EXTRA_LDLIBS="tirpc"
|
|
|
|
*/
|
2009-12-16 06:36:56 +05:30
|
|
|
# endif
|
|
|
|
# include <rpc/rpc.h>
|
|
|
|
# include <rpc/pmap_prot.h>
|
|
|
|
# include <rpc/pmap_clnt.h>
|
|
|
|
#endif
|
2006-09-15 20:42:00 +05:30
|
|
|
|
|
|
|
|
2006-12-19 04:37:42 +05:30
|
|
|
#if defined(__dietlibc__)
|
2008-12-05 22:10:36 +05:30
|
|
|
// 16.12.2006, Sampo Kellomaki (sampo@iki.fi)
|
|
|
|
// dietlibc-0.30 does not have implementation of getmntent_r()
|
2008-05-26 06:49:53 +05:30
|
|
|
static struct mntent *getmntent_r(FILE* stream, struct mntent* result,
|
2008-07-05 14:48:54 +05:30
|
|
|
char* buffer UNUSED_PARAM, int bufsize UNUSED_PARAM)
|
2006-12-19 04:37:42 +05:30
|
|
|
{
|
|
|
|
struct mntent* ment = getmntent(stream);
|
2008-05-26 06:49:53 +05:30
|
|
|
return memcpy(result, ment, sizeof(*ment));
|
2006-12-19 04:37:42 +05:30
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2006-03-14 23:46:25 +05:30
|
|
|
// Not real flags, but we want to be able to check for this.
|
2006-10-17 04:09:51 +05:30
|
|
|
enum {
|
2015-12-31 00:41:34 +05:30
|
|
|
MOUNT_USERS = (1 << 27) * ENABLE_DESKTOP,
|
|
|
|
MOUNT_NOFAIL = (1 << 28) * ENABLE_DESKTOP,
|
2008-03-17 14:16:43 +05:30
|
|
|
MOUNT_NOAUTO = (1 << 29),
|
|
|
|
MOUNT_SWAP = (1 << 30),
|
2015-12-31 00:41:34 +05:30
|
|
|
MOUNT_FAKEFLAGS = MOUNT_USERS | MOUNT_NOFAIL | MOUNT_NOAUTO | MOUNT_SWAP
|
2006-10-17 04:09:51 +05:30
|
|
|
};
|
2008-02-17 04:58:42 +05:30
|
|
|
|
|
|
|
|
2016-07-07 01:28:02 +05:30
|
|
|
#define OPTION_STR "o:*t:rwanfvsiO:" IF_FEATURE_MOUNT_OTHERTAB("T:")
|
2008-02-17 04:58:42 +05:30
|
|
|
enum {
|
|
|
|
OPT_o = (1 << 0),
|
|
|
|
OPT_t = (1 << 1),
|
|
|
|
OPT_r = (1 << 2),
|
|
|
|
OPT_w = (1 << 3),
|
|
|
|
OPT_a = (1 << 4),
|
|
|
|
OPT_n = (1 << 5),
|
|
|
|
OPT_f = (1 << 6),
|
|
|
|
OPT_v = (1 << 7),
|
|
|
|
OPT_s = (1 << 8),
|
|
|
|
OPT_i = (1 << 9),
|
2009-03-15 04:27:20 +05:30
|
|
|
OPT_O = (1 << 10),
|
2015-03-11 20:37:24 +05:30
|
|
|
OPT_T = (1 << 11),
|
2008-02-17 04:58:42 +05:30
|
|
|
};
|
|
|
|
|
|
|
|
#if ENABLE_FEATURE_MTAB_SUPPORT
|
2009-06-19 15:18:29 +05:30
|
|
|
#define USE_MTAB (!(option_mask32 & OPT_n))
|
2008-02-17 04:58:42 +05:30
|
|
|
#else
|
2009-06-19 15:18:29 +05:30
|
|
|
#define USE_MTAB 0
|
2008-02-17 04:58:42 +05:30
|
|
|
#endif
|
|
|
|
|
|
|
|
#if ENABLE_FEATURE_MOUNT_FAKE
|
2009-06-19 15:18:29 +05:30
|
|
|
#define FAKE_IT (option_mask32 & OPT_f)
|
2008-02-17 04:58:42 +05:30
|
|
|
#else
|
2009-06-19 15:18:29 +05:30
|
|
|
#define FAKE_IT 0
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if ENABLE_FEATURE_MOUNT_HELPERS
|
|
|
|
#define HELPERS_ALLOWED (!(option_mask32 & OPT_i))
|
|
|
|
#else
|
|
|
|
#define HELPERS_ALLOWED 0
|
2008-02-17 04:58:42 +05:30
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2006-10-17 04:09:51 +05:30
|
|
|
// TODO: more "user" flag compatibility.
|
|
|
|
// "user" option (from mount manpage):
|
|
|
|
// Only the user that mounted a filesystem can unmount it again.
|
|
|
|
// If any user should be able to unmount, then use users instead of user
|
|
|
|
// in the fstab line. The owner option is similar to the user option,
|
|
|
|
// with the restriction that the user must be the owner of the special file.
|
|
|
|
// This may be useful e.g. for /dev/fd if a login script makes
|
|
|
|
// the console user owner of this device.
|
2006-08-10 01:21:13 +05:30
|
|
|
|
2008-12-05 22:10:36 +05:30
|
|
|
// Standard mount options (from -o options or --options),
|
|
|
|
// with corresponding flags
|
2007-10-30 00:48:39 +05:30
|
|
|
static const int32_t mount_options[] = {
|
2006-08-08 07:09:49 +05:30
|
|
|
// MS_FLAGS set a bit. ~MS_FLAGS disable that bit. 0 flags are NOPs.
|
|
|
|
|
2009-04-21 16:39:40 +05:30
|
|
|
IF_FEATURE_MOUNT_LOOP(
|
2007-10-30 00:48:39 +05:30
|
|
|
/* "loop" */ 0,
|
2006-08-08 07:09:49 +05:30
|
|
|
)
|
|
|
|
|
2009-04-21 16:39:40 +05:30
|
|
|
IF_FEATURE_MOUNT_FSTAB(
|
2007-10-30 00:48:39 +05:30
|
|
|
/* "defaults" */ 0,
|
|
|
|
/* "quiet" 0 - do not filter out, vfat wants to see it */
|
|
|
|
/* "noauto" */ MOUNT_NOAUTO,
|
|
|
|
/* "sw" */ MOUNT_SWAP,
|
|
|
|
/* "swap" */ MOUNT_SWAP,
|
2009-04-21 16:39:40 +05:30
|
|
|
IF_DESKTOP(/* "user" */ MOUNT_USERS,)
|
|
|
|
IF_DESKTOP(/* "users" */ MOUNT_USERS,)
|
2015-12-31 00:41:34 +05:30
|
|
|
IF_DESKTOP(/* "nofail" */ MOUNT_NOFAIL,)
|
2008-01-29 15:01:09 +05:30
|
|
|
/* "_netdev" */ 0,
|
2013-01-17 07:00:35 +05:30
|
|
|
IF_DESKTOP(/* "comment=" */ 0,) /* systemd uses this in fstab */
|
2006-08-08 07:09:49 +05:30
|
|
|
)
|
|
|
|
|
2009-04-21 16:39:40 +05:30
|
|
|
IF_FEATURE_MOUNT_FLAGS(
|
2006-08-08 07:09:49 +05:30
|
|
|
// vfs flags
|
2007-10-30 00:48:39 +05:30
|
|
|
/* "nosuid" */ MS_NOSUID,
|
|
|
|
/* "suid" */ ~MS_NOSUID,
|
|
|
|
/* "dev" */ ~MS_NODEV,
|
|
|
|
/* "nodev" */ MS_NODEV,
|
|
|
|
/* "exec" */ ~MS_NOEXEC,
|
|
|
|
/* "noexec" */ MS_NOEXEC,
|
|
|
|
/* "sync" */ MS_SYNCHRONOUS,
|
2008-02-18 16:38:33 +05:30
|
|
|
/* "dirsync" */ MS_DIRSYNC,
|
2007-10-30 00:48:39 +05:30
|
|
|
/* "async" */ ~MS_SYNCHRONOUS,
|
|
|
|
/* "atime" */ ~MS_NOATIME,
|
|
|
|
/* "noatime" */ MS_NOATIME,
|
|
|
|
/* "diratime" */ ~MS_NODIRATIME,
|
|
|
|
/* "nodiratime" */ MS_NODIRATIME,
|
2008-07-08 08:26:53 +05:30
|
|
|
/* "mand" */ MS_MANDLOCK,
|
|
|
|
/* "nomand" */ ~MS_MANDLOCK,
|
2008-08-06 23:44:38 +05:30
|
|
|
/* "relatime" */ MS_RELATIME,
|
|
|
|
/* "norelatime" */ ~MS_RELATIME,
|
2012-06-26 19:39:00 +05:30
|
|
|
/* "strictatime" */ MS_STRICTATIME,
|
2007-10-30 00:48:39 +05:30
|
|
|
/* "loud" */ ~MS_SILENT,
|
2011-03-24 17:38:43 +05:30
|
|
|
/* "rbind" */ MS_BIND|MS_RECURSIVE,
|
2006-08-08 07:09:49 +05:30
|
|
|
|
|
|
|
// action flags
|
2009-10-05 05:48:01 +05:30
|
|
|
/* "union" */ MS_UNION,
|
2007-10-30 00:48:39 +05:30
|
|
|
/* "bind" */ MS_BIND,
|
|
|
|
/* "move" */ MS_MOVE,
|
|
|
|
/* "shared" */ MS_SHARED,
|
|
|
|
/* "slave" */ MS_SLAVE,
|
|
|
|
/* "private" */ MS_PRIVATE,
|
|
|
|
/* "unbindable" */ MS_UNBINDABLE,
|
|
|
|
/* "rshared" */ MS_SHARED|MS_RECURSIVE,
|
|
|
|
/* "rslave" */ MS_SLAVE|MS_RECURSIVE,
|
2011-03-23 13:50:25 +05:30
|
|
|
/* "rprivate" */ MS_PRIVATE|MS_RECURSIVE,
|
2007-10-30 00:48:39 +05:30
|
|
|
/* "runbindable" */ MS_UNBINDABLE|MS_RECURSIVE,
|
2006-08-08 07:09:49 +05:30
|
|
|
)
|
|
|
|
|
|
|
|
// Always understood.
|
2007-10-30 00:48:39 +05:30
|
|
|
/* "ro" */ MS_RDONLY, // vfs flag
|
|
|
|
/* "rw" */ ~MS_RDONLY, // vfs flag
|
|
|
|
/* "remount" */ MS_REMOUNT // action flag
|
1999-10-05 21:54:54 +05:30
|
|
|
};
|
|
|
|
|
2016-04-22 21:39:21 +05:30
|
|
|
static const char mount_option_str[] ALIGN1 =
|
2009-04-21 16:39:40 +05:30
|
|
|
IF_FEATURE_MOUNT_LOOP(
|
2008-12-10 16:58:30 +05:30
|
|
|
"loop\0"
|
2007-10-30 00:48:39 +05:30
|
|
|
)
|
2009-04-21 16:39:40 +05:30
|
|
|
IF_FEATURE_MOUNT_FSTAB(
|
2008-12-10 16:58:30 +05:30
|
|
|
"defaults\0"
|
|
|
|
// "quiet\0" - do not filter out, vfat wants to see it
|
|
|
|
"noauto\0"
|
|
|
|
"sw\0"
|
|
|
|
"swap\0"
|
2009-04-21 16:39:40 +05:30
|
|
|
IF_DESKTOP("user\0")
|
|
|
|
IF_DESKTOP("users\0")
|
2015-12-31 00:41:34 +05:30
|
|
|
IF_DESKTOP("nofail\0")
|
2008-12-10 16:58:30 +05:30
|
|
|
"_netdev\0"
|
2013-01-17 07:00:35 +05:30
|
|
|
IF_DESKTOP("comment=\0") /* systemd uses this in fstab */
|
2007-10-30 00:48:39 +05:30
|
|
|
)
|
2009-04-21 16:39:40 +05:30
|
|
|
IF_FEATURE_MOUNT_FLAGS(
|
2007-10-30 00:48:39 +05:30
|
|
|
// vfs flags
|
2008-12-10 16:58:30 +05:30
|
|
|
"nosuid\0"
|
|
|
|
"suid\0"
|
|
|
|
"dev\0"
|
|
|
|
"nodev\0"
|
|
|
|
"exec\0"
|
|
|
|
"noexec\0"
|
|
|
|
"sync\0"
|
|
|
|
"dirsync\0"
|
|
|
|
"async\0"
|
|
|
|
"atime\0"
|
|
|
|
"noatime\0"
|
|
|
|
"diratime\0"
|
|
|
|
"nodiratime\0"
|
|
|
|
"mand\0"
|
|
|
|
"nomand\0"
|
|
|
|
"relatime\0"
|
|
|
|
"norelatime\0"
|
2012-06-26 19:39:00 +05:30
|
|
|
"strictatime\0"
|
2008-12-10 16:58:30 +05:30
|
|
|
"loud\0"
|
2011-03-24 17:38:43 +05:30
|
|
|
"rbind\0"
|
2007-10-30 00:48:39 +05:30
|
|
|
|
|
|
|
// action flags
|
2009-10-05 05:48:01 +05:30
|
|
|
"union\0"
|
2008-12-10 16:58:30 +05:30
|
|
|
"bind\0"
|
|
|
|
"move\0"
|
2011-02-25 17:20:39 +05:30
|
|
|
"make-shared\0"
|
|
|
|
"make-slave\0"
|
|
|
|
"make-private\0"
|
|
|
|
"make-unbindable\0"
|
|
|
|
"make-rshared\0"
|
|
|
|
"make-rslave\0"
|
|
|
|
"make-rprivate\0"
|
|
|
|
"make-runbindable\0"
|
2007-10-30 00:48:39 +05:30
|
|
|
)
|
|
|
|
|
|
|
|
// Always understood.
|
2008-12-10 16:58:30 +05:30
|
|
|
"ro\0" // vfs flag
|
|
|
|
"rw\0" // vfs flag
|
|
|
|
"remount\0" // action flag
|
2007-10-30 00:48:39 +05:30
|
|
|
;
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2008-02-18 17:37:49 +05:30
|
|
|
|
|
|
|
struct globals {
|
|
|
|
#if ENABLE_FEATURE_MOUNT_NFS
|
|
|
|
smalluint nfs_mount_version;
|
|
|
|
#endif
|
|
|
|
#if ENABLE_FEATURE_MOUNT_VERBOSE
|
|
|
|
unsigned verbose;
|
|
|
|
#endif
|
|
|
|
llist_t *fslist;
|
2008-03-17 15:03:45 +05:30
|
|
|
char getmntent_buf[1];
|
2010-02-04 19:30:15 +05:30
|
|
|
} FIX_ALIASING;
|
2008-03-17 15:03:45 +05:30
|
|
|
enum { GETMNTENT_BUFSIZE = COMMON_BUFSIZE - offsetof(struct globals, getmntent_buf) };
|
2016-04-21 19:56:30 +05:30
|
|
|
#define G (*(struct globals*)bb_common_bufsiz1)
|
2008-02-18 17:37:49 +05:30
|
|
|
#define nfs_mount_version (G.nfs_mount_version)
|
2008-02-18 18:35:38 +05:30
|
|
|
#if ENABLE_FEATURE_MOUNT_VERBOSE
|
2008-02-18 17:37:49 +05:30
|
|
|
#define verbose (G.verbose )
|
2008-02-18 18:35:38 +05:30
|
|
|
#else
|
|
|
|
#define verbose 0
|
|
|
|
#endif
|
2008-02-18 17:37:49 +05:30
|
|
|
#define fslist (G.fslist )
|
|
|
|
#define getmntent_buf (G.getmntent_buf )
|
2016-04-21 21:48:48 +05:30
|
|
|
#define INIT_G() do { setup_common_bufsiz(); } while (0)
|
2008-02-18 17:37:49 +05:30
|
|
|
|
2011-02-28 09:36:01 +05:30
|
|
|
#if ENABLE_FEATURE_MTAB_SUPPORT
|
|
|
|
/*
|
|
|
|
* update_mtab_entry_on_move() is used to update entry in case of mount --move.
|
|
|
|
* we are looking for existing entries mnt_dir which is equal to mnt_fsname of
|
|
|
|
* input mntent and replace it by new one.
|
|
|
|
*/
|
|
|
|
static void FAST_FUNC update_mtab_entry_on_move(const struct mntent *mp)
|
|
|
|
{
|
|
|
|
struct mntent *entries, *m;
|
|
|
|
int i, count;
|
|
|
|
FILE *mountTable;
|
|
|
|
|
|
|
|
mountTable = setmntent(bb_path_mtab_file, "r");
|
|
|
|
if (!mountTable) {
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_perror_msg(bb_path_mtab_file);
|
2011-02-28 09:36:01 +05:30
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
entries = NULL;
|
|
|
|
count = 0;
|
|
|
|
while ((m = getmntent(mountTable)) != NULL) {
|
|
|
|
entries = xrealloc_vector(entries, 3, count);
|
|
|
|
entries[count].mnt_fsname = xstrdup(m->mnt_fsname);
|
|
|
|
entries[count].mnt_dir = xstrdup(m->mnt_dir);
|
|
|
|
entries[count].mnt_type = xstrdup(m->mnt_type);
|
|
|
|
entries[count].mnt_opts = xstrdup(m->mnt_opts);
|
|
|
|
entries[count].mnt_freq = m->mnt_freq;
|
|
|
|
entries[count].mnt_passno = m->mnt_passno;
|
|
|
|
count++;
|
|
|
|
}
|
|
|
|
endmntent(mountTable);
|
|
|
|
|
|
|
|
mountTable = setmntent(bb_path_mtab_file, "w");
|
|
|
|
if (mountTable) {
|
|
|
|
for (i = 0; i < count; i++) {
|
|
|
|
if (strcmp(entries[i].mnt_dir, mp->mnt_fsname) != 0)
|
|
|
|
addmntent(mountTable, &entries[i]);
|
|
|
|
else
|
|
|
|
addmntent(mountTable, mp);
|
|
|
|
}
|
|
|
|
endmntent(mountTable);
|
|
|
|
} else if (errno != EROFS)
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_perror_msg(bb_path_mtab_file);
|
2011-02-28 09:36:01 +05:30
|
|
|
|
|
|
|
if (ENABLE_FEATURE_CLEAN_UP) {
|
|
|
|
for (i = 0; i < count; i++) {
|
|
|
|
free(entries[i].mnt_fsname);
|
|
|
|
free(entries[i].mnt_dir);
|
|
|
|
free(entries[i].mnt_type);
|
|
|
|
free(entries[i].mnt_opts);
|
|
|
|
}
|
|
|
|
free(entries);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
2008-02-18 17:37:49 +05:30
|
|
|
|
|
|
|
#if ENABLE_FEATURE_MOUNT_VERBOSE
|
|
|
|
static int verbose_mount(const char *source, const char *target,
|
|
|
|
const char *filesystemtype,
|
|
|
|
unsigned long mountflags, const void *data)
|
|
|
|
{
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
errno = 0;
|
|
|
|
rc = mount(source, target, filesystemtype, mountflags, data);
|
|
|
|
if (verbose >= 2)
|
2008-03-17 14:16:43 +05:30
|
|
|
bb_perror_msg("mount('%s','%s','%s',0x%08lx,'%s'):%d",
|
2008-02-18 18:35:38 +05:30
|
|
|
source, target, filesystemtype,
|
|
|
|
mountflags, (char*)data, rc);
|
2008-02-18 17:37:49 +05:30
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
#define verbose_mount(...) mount(__VA_ARGS__)
|
|
|
|
#endif
|
|
|
|
|
2008-12-05 22:10:36 +05:30
|
|
|
// Append mount options to string
|
2007-01-30 04:21:44 +05:30
|
|
|
static void append_mount_options(char **oldopts, const char *newopts)
|
2006-03-14 23:46:25 +05:30
|
|
|
{
|
2006-09-17 20:30:58 +05:30
|
|
|
if (*oldopts && **oldopts) {
|
2008-12-05 22:10:36 +05:30
|
|
|
// Do not insert options which are already there
|
2006-09-17 20:38:12 +05:30
|
|
|
while (newopts[0]) {
|
|
|
|
char *p;
|
|
|
|
int len = strlen(newopts);
|
|
|
|
p = strchr(newopts, ',');
|
|
|
|
if (p) len = p - newopts;
|
|
|
|
p = *oldopts;
|
|
|
|
while (1) {
|
2006-10-17 04:09:51 +05:30
|
|
|
if (!strncmp(p, newopts, len)
|
2007-10-30 00:48:39 +05:30
|
|
|
&& (p[len] == ',' || p[len] == '\0'))
|
2006-09-17 20:38:12 +05:30
|
|
|
goto skip;
|
|
|
|
p = strchr(p,',');
|
2007-04-12 06:02:05 +05:30
|
|
|
if (!p) break;
|
2006-09-17 20:38:12 +05:30
|
|
|
p++;
|
|
|
|
}
|
|
|
|
p = xasprintf("%s,%.*s", *oldopts, len, newopts);
|
|
|
|
free(*oldopts);
|
|
|
|
*oldopts = p;
|
2007-10-30 00:48:39 +05:30
|
|
|
skip:
|
2006-09-17 20:38:12 +05:30
|
|
|
newopts += len;
|
|
|
|
while (newopts[0] == ',') newopts++;
|
|
|
|
}
|
2006-03-14 23:46:25 +05:30
|
|
|
} else {
|
|
|
|
if (ENABLE_FEATURE_CLEAN_UP) free(*oldopts);
|
2006-08-03 21:11:12 +05:30
|
|
|
*oldopts = xstrdup(newopts);
|
2006-03-14 23:46:25 +05:30
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-12-05 22:10:36 +05:30
|
|
|
// Use the mount_options list to parse options into flags.
|
2010-10-28 09:40:03 +05:30
|
|
|
// Also update list of unrecognized options if unrecognized != NULL
|
2012-06-21 15:38:56 +05:30
|
|
|
static unsigned long parse_mount_options(char *options, char **unrecognized)
|
1999-10-05 21:54:54 +05:30
|
|
|
{
|
2012-06-21 15:38:56 +05:30
|
|
|
unsigned long flags = MS_SILENT;
|
2006-03-14 23:46:25 +05:30
|
|
|
|
Major rewrite of mount, umount, losetup. Untangled lots of code, shrunk
things down a bit, fixed a number of funky corner cases, added support for
several new features (things like mount --move, mount --bind, lazy unounts,
automatic detection of loop mounts, and so on). Probably broke several
other things, but it's fixable. (Bang on it, tell me what doesn't work for
you...)
Note: you no longer need to say "-o loop". It does that for you when
necessary.
Still need to add "user mount" support, which involves making mount suid. Not
too hard to do under the new infrastructure, just haven't done it yet...
The previous code had the following notes, that belong in the version
control comments:
- * 3/21/1999 Charles P. Wright <cpwright@cpwright.com>
- * searches through fstab when -a is passed
- * will try mounting stuff with all fses when passed -t auto
- *
- * 1999-04-17 Dave Cinege...Rewrote -t auto. Fixed ro mtab.
- *
- * 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
- * dieting all around.
- *
- * 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.
- *
2005-08-11 02:05:54 +05:30
|
|
|
// Loop through options
|
2006-03-14 23:46:25 +05:30
|
|
|
for (;;) {
|
2008-05-16 03:00:45 +05:30
|
|
|
unsigned i;
|
2000-02-09 01:28:47 +05:30
|
|
|
char *comma = strchr(options, ',');
|
2007-10-30 00:48:39 +05:30
|
|
|
const char *option_str = mount_option_str;
|
2000-02-09 01:28:47 +05:30
|
|
|
|
2007-10-30 00:48:39 +05:30
|
|
|
if (comma) *comma = '\0';
|
2000-02-09 01:28:47 +05:30
|
|
|
|
2008-12-05 22:10:36 +05:30
|
|
|
// FIXME: use hasmntopt()
|
Major rewrite of mount, umount, losetup. Untangled lots of code, shrunk
things down a bit, fixed a number of funky corner cases, added support for
several new features (things like mount --move, mount --bind, lazy unounts,
automatic detection of loop mounts, and so on). Probably broke several
other things, but it's fixable. (Bang on it, tell me what doesn't work for
you...)
Note: you no longer need to say "-o loop". It does that for you when
necessary.
Still need to add "user mount" support, which involves making mount suid. Not
too hard to do under the new infrastructure, just haven't done it yet...
The previous code had the following notes, that belong in the version
control comments:
- * 3/21/1999 Charles P. Wright <cpwright@cpwright.com>
- * searches through fstab when -a is passed
- * will try mounting stuff with all fses when passed -t auto
- *
- * 1999-04-17 Dave Cinege...Rewrote -t auto. Fixed ro mtab.
- *
- * 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
- * dieting all around.
- *
- * 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.
- *
2005-08-11 02:05:54 +05:30
|
|
|
// Find this option in mount_options
|
2007-06-25 16:25:35 +05:30
|
|
|
for (i = 0; i < ARRAY_SIZE(mount_options); i++) {
|
2012-06-22 18:47:18 +05:30
|
|
|
unsigned opt_len = strlen(option_str);
|
2013-01-17 07:00:35 +05:30
|
|
|
|
2012-06-22 18:47:18 +05:30
|
|
|
if (strncasecmp(option_str, options, opt_len) == 0
|
2013-01-17 07:00:35 +05:30
|
|
|
&& (options[opt_len] == '\0'
|
|
|
|
/* or is it "comment=" thingy in fstab? */
|
|
|
|
IF_FEATURE_MOUNT_FSTAB(IF_DESKTOP( || option_str[opt_len-1] == '=' ))
|
|
|
|
)
|
2012-06-22 18:47:18 +05:30
|
|
|
) {
|
2012-06-21 15:38:56 +05:30
|
|
|
unsigned long fl = mount_options[i];
|
2012-06-26 19:39:00 +05:30
|
|
|
if (fl & BB_MS_INVERTED_VALUE)
|
2010-10-28 09:40:03 +05:30
|
|
|
flags &= fl;
|
|
|
|
else
|
|
|
|
flags |= fl;
|
|
|
|
goto found;
|
2000-02-09 01:28:47 +05:30
|
|
|
}
|
2012-06-22 18:47:18 +05:30
|
|
|
option_str += opt_len + 1;
|
2000-02-09 01:28:47 +05:30
|
|
|
}
|
2010-10-28 09:40:03 +05:30
|
|
|
// We did not recognize this option.
|
|
|
|
// If "unrecognized" is not NULL, append option there.
|
|
|
|
// Note that we should not append *empty* option -
|
|
|
|
// in this case we want to pass NULL, not "", to "data"
|
|
|
|
// parameter of mount(2) syscall.
|
|
|
|
// This is crucial for filesystems that don't accept
|
|
|
|
// any arbitrary mount options, like cgroup fs:
|
|
|
|
// "mount -t cgroup none /mnt"
|
|
|
|
if (options[0] && unrecognized) {
|
Major rewrite of mount, umount, losetup. Untangled lots of code, shrunk
things down a bit, fixed a number of funky corner cases, added support for
several new features (things like mount --move, mount --bind, lazy unounts,
automatic detection of loop mounts, and so on). Probably broke several
other things, but it's fixable. (Bang on it, tell me what doesn't work for
you...)
Note: you no longer need to say "-o loop". It does that for you when
necessary.
Still need to add "user mount" support, which involves making mount suid. Not
too hard to do under the new infrastructure, just haven't done it yet...
The previous code had the following notes, that belong in the version
control comments:
- * 3/21/1999 Charles P. Wright <cpwright@cpwright.com>
- * searches through fstab when -a is passed
- * will try mounting stuff with all fses when passed -t auto
- *
- * 1999-04-17 Dave Cinege...Rewrote -t auto. Fixed ro mtab.
- *
- * 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
- * dieting all around.
- *
- * 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.
- *
2005-08-11 02:05:54 +05:30
|
|
|
// Add it to strflags, to pass on to kernel
|
2010-10-28 09:40:03 +05:30
|
|
|
char *p = *unrecognized;
|
|
|
|
unsigned len = p ? strlen(p) : 0;
|
|
|
|
*unrecognized = p = xrealloc(p, len + strlen(options) + 2);
|
2006-03-20 23:37:50 +05:30
|
|
|
|
Major rewrite of mount, umount, losetup. Untangled lots of code, shrunk
things down a bit, fixed a number of funky corner cases, added support for
several new features (things like mount --move, mount --bind, lazy unounts,
automatic detection of loop mounts, and so on). Probably broke several
other things, but it's fixable. (Bang on it, tell me what doesn't work for
you...)
Note: you no longer need to say "-o loop". It does that for you when
necessary.
Still need to add "user mount" support, which involves making mount suid. Not
too hard to do under the new infrastructure, just haven't done it yet...
The previous code had the following notes, that belong in the version
control comments:
- * 3/21/1999 Charles P. Wright <cpwright@cpwright.com>
- * searches through fstab when -a is passed
- * will try mounting stuff with all fses when passed -t auto
- *
- * 1999-04-17 Dave Cinege...Rewrote -t auto. Fixed ro mtab.
- *
- * 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
- * dieting all around.
- *
- * 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.
- *
2005-08-11 02:05:54 +05:30
|
|
|
// Comma separated if it's not the first one
|
2010-10-28 09:40:03 +05:30
|
|
|
if (len) p[len++] = ',';
|
|
|
|
strcpy(p + len, options);
|
2000-02-09 01:28:47 +05:30
|
|
|
}
|
2010-10-28 09:40:03 +05:30
|
|
|
found:
|
2007-09-15 18:58:30 +05:30
|
|
|
if (!comma)
|
|
|
|
break;
|
|
|
|
// Advance to next option
|
|
|
|
*comma = ',';
|
|
|
|
options = ++comma;
|
1999-10-08 22:44:14 +05:30
|
|
|
}
|
2006-03-20 23:37:50 +05:30
|
|
|
|
2006-03-14 23:46:25 +05:30
|
|
|
return flags;
|
1999-10-05 21:54:54 +05:30
|
|
|
}
|
|
|
|
|
2006-03-14 23:46:25 +05:30
|
|
|
// Return a list of all block device backed filesystems
|
|
|
|
static llist_t *get_block_backed_filesystems(void)
|
2001-04-17 10:02:50 +05:30
|
|
|
{
|
2007-04-14 04:52:00 +05:30
|
|
|
static const char filesystems[2][sizeof("/proc/filesystems")] = {
|
2006-10-13 04:12:33 +05:30
|
|
|
"/etc/filesystems",
|
|
|
|
"/proc/filesystems",
|
|
|
|
};
|
|
|
|
char *fs, *buf;
|
2009-06-19 15:18:29 +05:30
|
|
|
llist_t *list = NULL;
|
2006-03-14 23:46:25 +05:30
|
|
|
int i;
|
|
|
|
FILE *f;
|
|
|
|
|
2007-04-14 04:52:00 +05:30
|
|
|
for (i = 0; i < 2; i++) {
|
2008-07-22 04:35:26 +05:30
|
|
|
f = fopen_for_read(filesystems[i]);
|
2006-09-17 20:30:58 +05:30
|
|
|
if (!f) continue;
|
2006-03-20 23:37:50 +05:30
|
|
|
|
2008-03-27 01:34:27 +05:30
|
|
|
while ((buf = xmalloc_fgetline(f)) != NULL) {
|
2015-03-12 22:18:34 +05:30
|
|
|
if (is_prefixed_with(buf, "nodev") && isspace(buf[5]))
|
2011-11-03 14:24:53 +05:30
|
|
|
goto next;
|
2006-10-25 18:16:03 +05:30
|
|
|
fs = skip_whitespace(buf);
|
2009-06-19 15:18:29 +05:30
|
|
|
if (*fs == '#' || *fs == '*' || !*fs)
|
2011-11-03 14:24:53 +05:30
|
|
|
goto next;
|
2006-03-20 23:37:50 +05:30
|
|
|
|
2006-10-13 04:12:33 +05:30
|
|
|
llist_add_to_end(&list, xstrdup(fs));
|
2011-11-03 14:24:53 +05:30
|
|
|
next:
|
2006-10-13 04:12:33 +05:30
|
|
|
free(buf);
|
2006-03-14 23:46:25 +05:30
|
|
|
}
|
|
|
|
if (ENABLE_FEATURE_CLEAN_UP) fclose(f);
|
|
|
|
}
|
2001-04-17 10:02:50 +05:30
|
|
|
|
2006-03-14 23:46:25 +05:30
|
|
|
return list;
|
|
|
|
}
|
2002-08-23 00:11:20 +05:30
|
|
|
|
2006-03-14 23:46:25 +05:30
|
|
|
#if ENABLE_FEATURE_CLEAN_UP
|
|
|
|
static void delete_block_backed_filesystems(void)
|
|
|
|
{
|
2006-05-09 00:33:07 +05:30
|
|
|
llist_free(fslist, free);
|
2006-03-14 23:46:25 +05:30
|
|
|
}
|
2006-03-29 20:00:49 +05:30
|
|
|
#else
|
|
|
|
void delete_block_backed_filesystems(void);
|
2006-03-14 23:46:25 +05:30
|
|
|
#endif
|
Major rewrite of mount, umount, losetup. Untangled lots of code, shrunk
things down a bit, fixed a number of funky corner cases, added support for
several new features (things like mount --move, mount --bind, lazy unounts,
automatic detection of loop mounts, and so on). Probably broke several
other things, but it's fixable. (Bang on it, tell me what doesn't work for
you...)
Note: you no longer need to say "-o loop". It does that for you when
necessary.
Still need to add "user mount" support, which involves making mount suid. Not
too hard to do under the new infrastructure, just haven't done it yet...
The previous code had the following notes, that belong in the version
control comments:
- * 3/21/1999 Charles P. Wright <cpwright@cpwright.com>
- * searches through fstab when -a is passed
- * will try mounting stuff with all fses when passed -t auto
- *
- * 1999-04-17 Dave Cinege...Rewrote -t auto. Fixed ro mtab.
- *
- * 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
- * dieting all around.
- *
- * 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.
- *
2005-08-11 02:05:54 +05:30
|
|
|
|
2006-03-14 23:46:25 +05:30
|
|
|
// Perform actual mount of specific filesystem at specific location.
|
2006-09-17 20:30:58 +05:30
|
|
|
// NB: mp->xxx fields may be trashed on exit
|
2012-06-21 15:38:56 +05:30
|
|
|
static int mount_it_now(struct mntent *mp, unsigned long vfsflags, char *filteropts)
|
2006-03-14 23:46:25 +05:30
|
|
|
{
|
2006-09-29 20:13:20 +05:30
|
|
|
int rc = 0;
|
2006-03-18 08:28:11 +05:30
|
|
|
|
2015-12-31 00:41:34 +05:30
|
|
|
vfsflags &= ~(unsigned long)MOUNT_FAKEFLAGS;
|
|
|
|
|
2009-06-19 15:18:29 +05:30
|
|
|
if (FAKE_IT) {
|
2008-02-18 18:35:38 +05:30
|
|
|
if (verbose >= 2)
|
|
|
|
bb_error_msg("would do mount('%s','%s','%s',0x%08lx,'%s')",
|
|
|
|
mp->mnt_fsname, mp->mnt_dir, mp->mnt_type,
|
|
|
|
vfsflags, filteropts);
|
|
|
|
goto mtab;
|
|
|
|
}
|
2006-03-20 23:37:13 +05:30
|
|
|
|
2006-03-14 23:46:25 +05:30
|
|
|
// Mount, with fallback to read-only if necessary.
|
2006-09-17 20:30:58 +05:30
|
|
|
for (;;) {
|
2008-02-18 17:37:49 +05:30
|
|
|
errno = 0;
|
|
|
|
rc = verbose_mount(mp->mnt_fsname, mp->mnt_dir, mp->mnt_type,
|
2006-03-14 23:46:25 +05:30
|
|
|
vfsflags, filteropts);
|
2008-02-04 05:22:41 +05:30
|
|
|
|
|
|
|
// If mount failed, try
|
2008-06-25 00:29:59 +05:30
|
|
|
// helper program mount.<mnt_type>
|
2009-09-16 02:30:09 +05:30
|
|
|
if (HELPERS_ALLOWED && rc && mp->mnt_type) {
|
2009-06-19 15:18:29 +05:30
|
|
|
char *args[8];
|
2008-02-04 05:22:41 +05:30
|
|
|
int errno_save = errno;
|
2008-03-17 14:16:43 +05:30
|
|
|
args[0] = xasprintf("mount.%s", mp->mnt_type);
|
2008-02-04 05:22:41 +05:30
|
|
|
rc = 1;
|
2009-06-19 15:18:29 +05:30
|
|
|
if (FAKE_IT)
|
|
|
|
args[rc++] = (char *)"-f";
|
|
|
|
if (ENABLE_FEATURE_MTAB_SUPPORT && !USE_MTAB)
|
|
|
|
args[rc++] = (char *)"-n";
|
2009-04-12 17:46:21 +05:30
|
|
|
args[rc++] = mp->mnt_fsname;
|
|
|
|
args[rc++] = mp->mnt_dir;
|
2008-02-04 05:22:41 +05:30
|
|
|
if (filteropts) {
|
|
|
|
args[rc++] = (char *)"-o";
|
|
|
|
args[rc++] = filteropts;
|
|
|
|
}
|
|
|
|
args[rc] = NULL;
|
2010-03-19 03:14:00 +05:30
|
|
|
rc = spawn_and_wait(args);
|
2008-03-17 14:16:43 +05:30
|
|
|
free(args[0]);
|
2008-02-04 05:22:41 +05:30
|
|
|
if (!rc)
|
|
|
|
break;
|
|
|
|
errno = errno_save;
|
|
|
|
}
|
|
|
|
|
2007-10-30 00:48:39 +05:30
|
|
|
if (!rc || (vfsflags & MS_RDONLY) || (errno != EACCES && errno != EROFS))
|
2004-04-12 20:32:53 +05:30
|
|
|
break;
|
2007-09-15 18:58:30 +05:30
|
|
|
if (!(vfsflags & MS_SILENT))
|
|
|
|
bb_error_msg("%s is write-protected, mounting read-only",
|
|
|
|
mp->mnt_fsname);
|
2006-03-14 23:46:25 +05:30
|
|
|
vfsflags |= MS_RDONLY;
|
2001-04-17 10:18:51 +05:30
|
|
|
}
|
|
|
|
|
2006-03-14 23:46:25 +05:30
|
|
|
// Abort entirely if permission denied.
|
2002-08-23 00:11:20 +05:30
|
|
|
|
2006-03-14 23:46:25 +05:30
|
|
|
if (rc && errno == EPERM)
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg_and_die(bb_msg_perm_denied_are_you_root);
|
Major rewrite of mount, umount, losetup. Untangled lots of code, shrunk
things down a bit, fixed a number of funky corner cases, added support for
several new features (things like mount --move, mount --bind, lazy unounts,
automatic detection of loop mounts, and so on). Probably broke several
other things, but it's fixable. (Bang on it, tell me what doesn't work for
you...)
Note: you no longer need to say "-o loop". It does that for you when
necessary.
Still need to add "user mount" support, which involves making mount suid. Not
too hard to do under the new infrastructure, just haven't done it yet...
The previous code had the following notes, that belong in the version
control comments:
- * 3/21/1999 Charles P. Wright <cpwright@cpwright.com>
- * searches through fstab when -a is passed
- * will try mounting stuff with all fses when passed -t auto
- *
- * 1999-04-17 Dave Cinege...Rewrote -t auto. Fixed ro mtab.
- *
- * 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
- * dieting all around.
- *
- * 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.
- *
2005-08-11 02:05:54 +05:30
|
|
|
|
2008-12-05 22:10:36 +05:30
|
|
|
// If the mount was successful, and we're maintaining an old-style
|
|
|
|
// mtab file by hand, add the new entry to it now.
|
2006-11-19 23:04:57 +05:30
|
|
|
mtab:
|
2009-06-19 15:18:29 +05:30
|
|
|
if (USE_MTAB && !rc && !(vfsflags & MS_REMOUNT)) {
|
2006-09-17 20:39:48 +05:30
|
|
|
char *fsname;
|
2006-03-14 23:46:25 +05:30
|
|
|
FILE *mountTable = setmntent(bb_path_mtab_file, "a+");
|
2007-10-30 00:48:39 +05:30
|
|
|
const char *option_str = mount_option_str;
|
2006-03-14 23:46:25 +05:30
|
|
|
int i;
|
Major rewrite of mount, umount, losetup. Untangled lots of code, shrunk
things down a bit, fixed a number of funky corner cases, added support for
several new features (things like mount --move, mount --bind, lazy unounts,
automatic detection of loop mounts, and so on). Probably broke several
other things, but it's fixable. (Bang on it, tell me what doesn't work for
you...)
Note: you no longer need to say "-o loop". It does that for you when
necessary.
Still need to add "user mount" support, which involves making mount suid. Not
too hard to do under the new infrastructure, just haven't done it yet...
The previous code had the following notes, that belong in the version
control comments:
- * 3/21/1999 Charles P. Wright <cpwright@cpwright.com>
- * searches through fstab when -a is passed
- * will try mounting stuff with all fses when passed -t auto
- *
- * 1999-04-17 Dave Cinege...Rewrote -t auto. Fixed ro mtab.
- *
- * 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
- * dieting all around.
- *
- * 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.
- *
2005-08-11 02:05:54 +05:30
|
|
|
|
2006-11-19 23:04:57 +05:30
|
|
|
if (!mountTable) {
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_perror_msg(bb_path_mtab_file);
|
2006-11-19 23:04:57 +05:30
|
|
|
goto ret;
|
|
|
|
}
|
Major rewrite of mount, umount, losetup. Untangled lots of code, shrunk
things down a bit, fixed a number of funky corner cases, added support for
several new features (things like mount --move, mount --bind, lazy unounts,
automatic detection of loop mounts, and so on). Probably broke several
other things, but it's fixable. (Bang on it, tell me what doesn't work for
you...)
Note: you no longer need to say "-o loop". It does that for you when
necessary.
Still need to add "user mount" support, which involves making mount suid. Not
too hard to do under the new infrastructure, just haven't done it yet...
The previous code had the following notes, that belong in the version
control comments:
- * 3/21/1999 Charles P. Wright <cpwright@cpwright.com>
- * searches through fstab when -a is passed
- * will try mounting stuff with all fses when passed -t auto
- *
- * 1999-04-17 Dave Cinege...Rewrote -t auto. Fixed ro mtab.
- *
- * 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
- * dieting all around.
- *
- * 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.
- *
2005-08-11 02:05:54 +05:30
|
|
|
|
2006-03-14 23:46:25 +05:30
|
|
|
// Add vfs string flags
|
2007-10-30 00:48:39 +05:30
|
|
|
for (i = 0; mount_options[i] != MS_REMOUNT; i++) {
|
|
|
|
if (mount_options[i] > 0 && (mount_options[i] & vfsflags))
|
|
|
|
append_mount_options(&(mp->mnt_opts), option_str);
|
|
|
|
option_str += strlen(option_str) + 1;
|
|
|
|
}
|
2006-03-14 23:46:25 +05:30
|
|
|
|
|
|
|
// Remove trailing / (if any) from directory we mounted on
|
2006-09-14 18:49:19 +05:30
|
|
|
i = strlen(mp->mnt_dir) - 1;
|
2011-02-28 09:36:01 +05:30
|
|
|
while (i > 0 && mp->mnt_dir[i] == '/')
|
2011-02-28 15:39:49 +05:30
|
|
|
mp->mnt_dir[i--] = '\0';
|
2006-09-14 18:49:19 +05:30
|
|
|
|
2006-09-17 20:31:53 +05:30
|
|
|
// Convert to canonical pathnames as needed
|
2006-09-17 20:39:48 +05:30
|
|
|
mp->mnt_dir = bb_simplify_path(mp->mnt_dir);
|
2011-02-28 09:36:01 +05:30
|
|
|
fsname = NULL;
|
2008-12-05 22:10:36 +05:30
|
|
|
if (!mp->mnt_type || !*mp->mnt_type) { // bind mount
|
2006-09-17 20:31:53 +05:30
|
|
|
mp->mnt_fsname = fsname = bb_simplify_path(mp->mnt_fsname);
|
2007-01-30 04:21:44 +05:30
|
|
|
mp->mnt_type = (char*)"bind";
|
2006-09-14 18:49:19 +05:30
|
|
|
}
|
2006-09-14 21:16:33 +05:30
|
|
|
mp->mnt_freq = mp->mnt_passno = 0;
|
2006-03-14 23:46:25 +05:30
|
|
|
|
2011-02-28 09:36:01 +05:30
|
|
|
// Write and close
|
|
|
|
#if ENABLE_FEATURE_MTAB_SUPPORT
|
|
|
|
if (vfsflags & MS_MOVE)
|
|
|
|
update_mtab_entry_on_move(mp);
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
addmntent(mountTable, mp);
|
Major rewrite of mount, umount, losetup. Untangled lots of code, shrunk
things down a bit, fixed a number of funky corner cases, added support for
several new features (things like mount --move, mount --bind, lazy unounts,
automatic detection of loop mounts, and so on). Probably broke several
other things, but it's fixable. (Bang on it, tell me what doesn't work for
you...)
Note: you no longer need to say "-o loop". It does that for you when
necessary.
Still need to add "user mount" support, which involves making mount suid. Not
too hard to do under the new infrastructure, just haven't done it yet...
The previous code had the following notes, that belong in the version
control comments:
- * 3/21/1999 Charles P. Wright <cpwright@cpwright.com>
- * searches through fstab when -a is passed
- * will try mounting stuff with all fses when passed -t auto
- *
- * 1999-04-17 Dave Cinege...Rewrote -t auto. Fixed ro mtab.
- *
- * 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
- * dieting all around.
- *
- * 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.
- *
2005-08-11 02:05:54 +05:30
|
|
|
endmntent(mountTable);
|
2011-02-28 09:36:01 +05:30
|
|
|
|
2006-09-17 20:31:53 +05:30
|
|
|
if (ENABLE_FEATURE_CLEAN_UP) {
|
2006-09-17 20:39:48 +05:30
|
|
|
free(mp->mnt_dir);
|
2006-09-17 20:31:53 +05:30
|
|
|
free(fsname);
|
|
|
|
}
|
2001-05-04 20:19:58 +05:30
|
|
|
}
|
2006-11-19 23:04:57 +05:30
|
|
|
ret:
|
2006-03-14 23:46:25 +05:30
|
|
|
return rc;
|
|
|
|
}
|
2001-05-03 02:47:38 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
#if ENABLE_FEATURE_MOUNT_NFS
|
2006-09-01 13:40:44 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
/*
|
|
|
|
* Linux NFS mount
|
|
|
|
* Copyright (C) 1993 Rick Sladkey <jrs@world.std.com>
|
|
|
|
*
|
2010-08-16 23:44:46 +05:30
|
|
|
* Licensed under GPLv2, see file LICENSE in this source tree.
|
2006-09-15 20:42:00 +05:30
|
|
|
*
|
|
|
|
* Wed Feb 8 12:51:48 1995, biro@yggdrasil.com (Ross Biro): allow all port
|
|
|
|
* numbers to be specified on the command line.
|
|
|
|
*
|
|
|
|
* Fri, 8 Mar 1996 18:01:39, Swen Thuemmler <swen@uni-paderborn.de>:
|
|
|
|
* Omit the call to connect() for Linux version 1.3.11 or later.
|
|
|
|
*
|
|
|
|
* Wed Oct 1 23:55:28 1997: Dick Streefland <dick_streefland@tasking.com>
|
|
|
|
* Implemented the "bg", "fg" and "retry" mount options for NFS.
|
|
|
|
*
|
2008-03-17 14:59:43 +05:30
|
|
|
* 1999-02-22 Arkadiusz Mickiewicz <misiek@misiek.eu.org>
|
2006-09-15 20:42:00 +05:30
|
|
|
* - added Native Language Support
|
|
|
|
*
|
|
|
|
* Modified by Olaf Kirch and Trond Myklebust for new NFS code,
|
|
|
|
* plus NFSv3 stuff.
|
|
|
|
*/
|
2006-09-01 13:40:44 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
#define MOUNTPORT 635
|
|
|
|
#define MNTPATHLEN 1024
|
|
|
|
#define MNTNAMLEN 255
|
|
|
|
#define FHSIZE 32
|
|
|
|
#define FHSIZE3 64
|
2006-09-01 13:40:44 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
typedef char fhandle[FHSIZE];
|
2006-09-01 13:40:44 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
typedef struct {
|
|
|
|
unsigned int fhandle3_len;
|
|
|
|
char *fhandle3_val;
|
|
|
|
} fhandle3;
|
2006-09-01 13:40:44 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
enum mountstat3 {
|
|
|
|
MNT_OK = 0,
|
|
|
|
MNT3ERR_PERM = 1,
|
|
|
|
MNT3ERR_NOENT = 2,
|
|
|
|
MNT3ERR_IO = 5,
|
|
|
|
MNT3ERR_ACCES = 13,
|
|
|
|
MNT3ERR_NOTDIR = 20,
|
|
|
|
MNT3ERR_INVAL = 22,
|
|
|
|
MNT3ERR_NAMETOOLONG = 63,
|
|
|
|
MNT3ERR_NOTSUPP = 10004,
|
|
|
|
MNT3ERR_SERVERFAULT = 10006,
|
|
|
|
};
|
|
|
|
typedef enum mountstat3 mountstat3;
|
2006-09-01 13:40:44 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
struct fhstatus {
|
|
|
|
unsigned int fhs_status;
|
|
|
|
union {
|
|
|
|
fhandle fhs_fhandle;
|
|
|
|
} fhstatus_u;
|
|
|
|
};
|
|
|
|
typedef struct fhstatus fhstatus;
|
2006-09-01 13:40:44 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
struct mountres3_ok {
|
|
|
|
fhandle3 fhandle;
|
|
|
|
struct {
|
|
|
|
unsigned int auth_flavours_len;
|
|
|
|
char *auth_flavours_val;
|
|
|
|
} auth_flavours;
|
|
|
|
};
|
|
|
|
typedef struct mountres3_ok mountres3_ok;
|
2006-09-01 13:40:44 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
struct mountres3 {
|
|
|
|
mountstat3 fhs_status;
|
|
|
|
union {
|
|
|
|
mountres3_ok mountinfo;
|
|
|
|
} mountres3_u;
|
|
|
|
};
|
|
|
|
typedef struct mountres3 mountres3;
|
2006-09-01 13:40:44 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
typedef char *dirpath;
|
2006-09-01 13:40:44 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
typedef char *name;
|
2006-09-01 13:40:44 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
typedef struct mountbody *mountlist;
|
2006-03-14 23:46:25 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
struct mountbody {
|
|
|
|
name ml_hostname;
|
|
|
|
dirpath ml_directory;
|
|
|
|
mountlist ml_next;
|
|
|
|
};
|
|
|
|
typedef struct mountbody mountbody;
|
Major rewrite of mount, umount, losetup. Untangled lots of code, shrunk
things down a bit, fixed a number of funky corner cases, added support for
several new features (things like mount --move, mount --bind, lazy unounts,
automatic detection of loop mounts, and so on). Probably broke several
other things, but it's fixable. (Bang on it, tell me what doesn't work for
you...)
Note: you no longer need to say "-o loop". It does that for you when
necessary.
Still need to add "user mount" support, which involves making mount suid. Not
too hard to do under the new infrastructure, just haven't done it yet...
The previous code had the following notes, that belong in the version
control comments:
- * 3/21/1999 Charles P. Wright <cpwright@cpwright.com>
- * searches through fstab when -a is passed
- * will try mounting stuff with all fses when passed -t auto
- *
- * 1999-04-17 Dave Cinege...Rewrote -t auto. Fixed ro mtab.
- *
- * 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
- * dieting all around.
- *
- * 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.
- *
2005-08-11 02:05:54 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
typedef struct groupnode *groups;
|
2006-03-14 23:46:25 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
struct groupnode {
|
|
|
|
name gr_name;
|
|
|
|
groups gr_next;
|
|
|
|
};
|
|
|
|
typedef struct groupnode groupnode;
|
2006-03-20 23:37:50 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
typedef struct exportnode *exports;
|
2006-03-18 08:28:11 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
struct exportnode {
|
|
|
|
dirpath ex_dir;
|
|
|
|
groups ex_groups;
|
|
|
|
exports ex_next;
|
|
|
|
};
|
|
|
|
typedef struct exportnode exportnode;
|
2001-08-10 20:35:27 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
struct ppathcnf {
|
|
|
|
int pc_link_max;
|
|
|
|
short pc_max_canon;
|
|
|
|
short pc_max_input;
|
|
|
|
short pc_name_max;
|
|
|
|
short pc_path_max;
|
|
|
|
short pc_pipe_buf;
|
2006-12-20 02:02:02 +05:30
|
|
|
uint8_t pc_vdisable;
|
2006-09-15 20:42:00 +05:30
|
|
|
char pc_xxx;
|
|
|
|
short pc_mask[2];
|
|
|
|
};
|
|
|
|
typedef struct ppathcnf ppathcnf;
|
1999-10-05 21:54:54 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
#define MOUNTPROG 100005
|
|
|
|
#define MOUNTVERS 1
|
2000-03-07 13:11:42 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
#define MOUNTPROC_NULL 0
|
|
|
|
#define MOUNTPROC_MNT 1
|
|
|
|
#define MOUNTPROC_DUMP 2
|
|
|
|
#define MOUNTPROC_UMNT 3
|
|
|
|
#define MOUNTPROC_UMNTALL 4
|
|
|
|
#define MOUNTPROC_EXPORT 5
|
|
|
|
#define MOUNTPROC_EXPORTALL 6
|
2006-01-25 05:38:53 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
#define MOUNTVERS_POSIX 2
|
Major rewrite of mount, umount, losetup. Untangled lots of code, shrunk
things down a bit, fixed a number of funky corner cases, added support for
several new features (things like mount --move, mount --bind, lazy unounts,
automatic detection of loop mounts, and so on). Probably broke several
other things, but it's fixable. (Bang on it, tell me what doesn't work for
you...)
Note: you no longer need to say "-o loop". It does that for you when
necessary.
Still need to add "user mount" support, which involves making mount suid. Not
too hard to do under the new infrastructure, just haven't done it yet...
The previous code had the following notes, that belong in the version
control comments:
- * 3/21/1999 Charles P. Wright <cpwright@cpwright.com>
- * searches through fstab when -a is passed
- * will try mounting stuff with all fses when passed -t auto
- *
- * 1999-04-17 Dave Cinege...Rewrote -t auto. Fixed ro mtab.
- *
- * 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
- * dieting all around.
- *
- * 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.
- *
2005-08-11 02:05:54 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
#define MOUNTPROC_PATHCONF 7
|
2006-03-18 08:28:11 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
#define MOUNT_V3 3
|
2006-03-18 08:28:11 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
#define MOUNTPROC3_NULL 0
|
|
|
|
#define MOUNTPROC3_MNT 1
|
|
|
|
#define MOUNTPROC3_DUMP 2
|
|
|
|
#define MOUNTPROC3_UMNT 3
|
|
|
|
#define MOUNTPROC3_UMNTALL 4
|
|
|
|
#define MOUNTPROC3_EXPORT 5
|
2006-03-20 23:37:50 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
enum {
|
|
|
|
#ifndef NFS_FHSIZE
|
|
|
|
NFS_FHSIZE = 32,
|
|
|
|
#endif
|
|
|
|
#ifndef NFS_PORT
|
|
|
|
NFS_PORT = 2049
|
|
|
|
#endif
|
|
|
|
};
|
Major rewrite of mount, umount, losetup. Untangled lots of code, shrunk
things down a bit, fixed a number of funky corner cases, added support for
several new features (things like mount --move, mount --bind, lazy unounts,
automatic detection of loop mounts, and so on). Probably broke several
other things, but it's fixable. (Bang on it, tell me what doesn't work for
you...)
Note: you no longer need to say "-o loop". It does that for you when
necessary.
Still need to add "user mount" support, which involves making mount suid. Not
too hard to do under the new infrastructure, just haven't done it yet...
The previous code had the following notes, that belong in the version
control comments:
- * 3/21/1999 Charles P. Wright <cpwright@cpwright.com>
- * searches through fstab when -a is passed
- * will try mounting stuff with all fses when passed -t auto
- *
- * 1999-04-17 Dave Cinege...Rewrote -t auto. Fixed ro mtab.
- *
- * 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
- * dieting all around.
- *
- * 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.
- *
2005-08-11 02:05:54 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
/*
|
|
|
|
* We want to be able to compile mount on old kernels in such a way
|
|
|
|
* that the binary will work well on more recent kernels.
|
|
|
|
* Thus, if necessary we teach nfsmount.c the structure of new fields
|
|
|
|
* that will come later.
|
|
|
|
*
|
|
|
|
* Moreover, the new kernel includes conflict with glibc includes
|
|
|
|
* so it is easiest to ignore the kernel altogether (at compile time).
|
|
|
|
*/
|
Major rewrite of mount, umount, losetup. Untangled lots of code, shrunk
things down a bit, fixed a number of funky corner cases, added support for
several new features (things like mount --move, mount --bind, lazy unounts,
automatic detection of loop mounts, and so on). Probably broke several
other things, but it's fixable. (Bang on it, tell me what doesn't work for
you...)
Note: you no longer need to say "-o loop". It does that for you when
necessary.
Still need to add "user mount" support, which involves making mount suid. Not
too hard to do under the new infrastructure, just haven't done it yet...
The previous code had the following notes, that belong in the version
control comments:
- * 3/21/1999 Charles P. Wright <cpwright@cpwright.com>
- * searches through fstab when -a is passed
- * will try mounting stuff with all fses when passed -t auto
- *
- * 1999-04-17 Dave Cinege...Rewrote -t auto. Fixed ro mtab.
- *
- * 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
- * dieting all around.
- *
- * 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.
- *
2005-08-11 02:05:54 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
struct nfs2_fh {
|
2011-11-10 19:49:25 +05:30
|
|
|
char data[32];
|
2006-09-15 20:42:00 +05:30
|
|
|
};
|
|
|
|
struct nfs3_fh {
|
2011-11-10 19:49:25 +05:30
|
|
|
unsigned short size;
|
|
|
|
unsigned char data[64];
|
2006-09-15 20:42:00 +05:30
|
|
|
};
|
2006-03-29 20:00:49 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
struct nfs_mount_data {
|
2011-11-10 19:49:25 +05:30
|
|
|
int version; /* 1 */
|
|
|
|
int fd; /* 1 */
|
|
|
|
struct nfs2_fh old_root; /* 1 */
|
|
|
|
int flags; /* 1 */
|
|
|
|
int rsize; /* 1 */
|
|
|
|
int wsize; /* 1 */
|
|
|
|
int timeo; /* 1 */
|
|
|
|
int retrans; /* 1 */
|
|
|
|
int acregmin; /* 1 */
|
|
|
|
int acregmax; /* 1 */
|
|
|
|
int acdirmin; /* 1 */
|
|
|
|
int acdirmax; /* 1 */
|
|
|
|
struct sockaddr_in addr; /* 1 */
|
|
|
|
char hostname[256]; /* 1 */
|
|
|
|
int namlen; /* 2 */
|
|
|
|
unsigned int bsize; /* 3 */
|
|
|
|
struct nfs3_fh root; /* 4 */
|
2006-09-15 20:42:00 +05:30
|
|
|
};
|
2006-09-01 13:40:44 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
/* bits in the flags field */
|
|
|
|
enum {
|
|
|
|
NFS_MOUNT_SOFT = 0x0001, /* 1 */
|
|
|
|
NFS_MOUNT_INTR = 0x0002, /* 1 */
|
|
|
|
NFS_MOUNT_SECURE = 0x0004, /* 1 */
|
|
|
|
NFS_MOUNT_POSIX = 0x0008, /* 1 */
|
|
|
|
NFS_MOUNT_NOCTO = 0x0010, /* 1 */
|
|
|
|
NFS_MOUNT_NOAC = 0x0020, /* 1 */
|
|
|
|
NFS_MOUNT_TCP = 0x0040, /* 2 */
|
|
|
|
NFS_MOUNT_VER3 = 0x0080, /* 3 */
|
|
|
|
NFS_MOUNT_KERBEROS = 0x0100, /* 3 */
|
2008-07-20 04:10:30 +05:30
|
|
|
NFS_MOUNT_NONLM = 0x0200, /* 3 */
|
2011-11-10 19:49:25 +05:30
|
|
|
NFS_MOUNT_NOACL = 0x0800, /* 4 */
|
2008-07-20 04:10:30 +05:30
|
|
|
NFS_MOUNT_NORDIRPLUS = 0x4000
|
2006-09-15 20:42:00 +05:30
|
|
|
};
|
2006-09-01 13:40:44 +05:30
|
|
|
|
2006-06-21 09:23:33 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
/*
|
|
|
|
* We need to translate between nfs status return values and
|
|
|
|
* the local errno values which may not be the same.
|
|
|
|
*
|
|
|
|
* Andreas Schwab <schwab@LS5.informatik.uni-dortmund.de>: change errno:
|
|
|
|
* "after #include <errno.h> the symbol errno is reserved for any use,
|
|
|
|
* it cannot even be used as a struct tag or field name".
|
|
|
|
*/
|
|
|
|
#ifndef EDQUOT
|
2009-12-16 06:36:56 +05:30
|
|
|
# define EDQUOT ENOSPC
|
2006-09-15 20:42:00 +05:30
|
|
|
#endif
|
2008-12-05 22:10:36 +05:30
|
|
|
/* Convert each NFSERR_BLAH into EBLAH */
|
2016-04-22 21:39:21 +05:30
|
|
|
static const uint8_t nfs_err_stat[] ALIGN1 = {
|
2009-12-16 06:36:56 +05:30
|
|
|
1, 2, 5, 6, 13, 17,
|
|
|
|
19, 20, 21, 22, 27, 28,
|
|
|
|
30, 63, 66, 69, 70, 71
|
|
|
|
};
|
2010-05-19 20:31:29 +05:30
|
|
|
#if ( \
|
|
|
|
EPERM | ENOENT | EIO | ENXIO | EACCES| EEXIST | \
|
|
|
|
ENODEV| ENOTDIR | EISDIR | EINVAL| EFBIG | ENOSPC | \
|
|
|
|
EROFS | ENAMETOOLONG| ENOTEMPTY| EDQUOT| ESTALE| EREMOTE) < 256
|
|
|
|
typedef uint8_t nfs_err_type;
|
|
|
|
#else
|
|
|
|
typedef uint16_t nfs_err_type;
|
|
|
|
#endif
|
2016-04-22 21:39:21 +05:30
|
|
|
static const nfs_err_type nfs_err_errnum[] ALIGN2 = {
|
2009-12-16 06:36:56 +05:30
|
|
|
EPERM , ENOENT , EIO , ENXIO , EACCES, EEXIST,
|
|
|
|
ENODEV, ENOTDIR , EISDIR , EINVAL, EFBIG , ENOSPC,
|
|
|
|
EROFS , ENAMETOOLONG, ENOTEMPTY, EDQUOT, ESTALE, EREMOTE
|
2006-09-15 20:42:00 +05:30
|
|
|
};
|
|
|
|
static char *nfs_strerror(int status)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
2009-12-16 06:36:56 +05:30
|
|
|
for (i = 0; i < ARRAY_SIZE(nfs_err_stat); i++) {
|
|
|
|
if (nfs_err_stat[i] == status)
|
|
|
|
return strerror(nfs_err_errnum[i]);
|
2006-03-14 23:46:25 +05:30
|
|
|
}
|
2007-09-28 15:59:17 +05:30
|
|
|
return xasprintf("unknown nfs status return value: %d", status);
|
2006-09-15 20:42:00 +05:30
|
|
|
}
|
Major rewrite of mount, umount, losetup. Untangled lots of code, shrunk
things down a bit, fixed a number of funky corner cases, added support for
several new features (things like mount --move, mount --bind, lazy unounts,
automatic detection of loop mounts, and so on). Probably broke several
other things, but it's fixable. (Bang on it, tell me what doesn't work for
you...)
Note: you no longer need to say "-o loop". It does that for you when
necessary.
Still need to add "user mount" support, which involves making mount suid. Not
too hard to do under the new infrastructure, just haven't done it yet...
The previous code had the following notes, that belong in the version
control comments:
- * 3/21/1999 Charles P. Wright <cpwright@cpwright.com>
- * searches through fstab when -a is passed
- * will try mounting stuff with all fses when passed -t auto
- *
- * 1999-04-17 Dave Cinege...Rewrote -t auto. Fixed ro mtab.
- *
- * 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
- * dieting all around.
- *
- * 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.
- *
2005-08-11 02:05:54 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
static bool_t xdr_fhandle(XDR *xdrs, fhandle objp)
|
|
|
|
{
|
2010-10-22 17:05:47 +05:30
|
|
|
return xdr_opaque(xdrs, objp, FHSIZE);
|
2006-09-15 20:42:00 +05:30
|
|
|
}
|
Major rewrite of mount, umount, losetup. Untangled lots of code, shrunk
things down a bit, fixed a number of funky corner cases, added support for
several new features (things like mount --move, mount --bind, lazy unounts,
automatic detection of loop mounts, and so on). Probably broke several
other things, but it's fixable. (Bang on it, tell me what doesn't work for
you...)
Note: you no longer need to say "-o loop". It does that for you when
necessary.
Still need to add "user mount" support, which involves making mount suid. Not
too hard to do under the new infrastructure, just haven't done it yet...
The previous code had the following notes, that belong in the version
control comments:
- * 3/21/1999 Charles P. Wright <cpwright@cpwright.com>
- * searches through fstab when -a is passed
- * will try mounting stuff with all fses when passed -t auto
- *
- * 1999-04-17 Dave Cinege...Rewrote -t auto. Fixed ro mtab.
- *
- * 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
- * dieting all around.
- *
- * 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.
- *
2005-08-11 02:05:54 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
static bool_t xdr_fhstatus(XDR *xdrs, fhstatus *objp)
|
|
|
|
{
|
|
|
|
if (!xdr_u_int(xdrs, &objp->fhs_status))
|
2013-01-14 06:04:48 +05:30
|
|
|
return FALSE;
|
2010-10-22 17:05:47 +05:30
|
|
|
if (objp->fhs_status == 0)
|
|
|
|
return xdr_fhandle(xdrs, objp->fhstatus_u.fhs_fhandle);
|
2006-09-15 20:42:00 +05:30
|
|
|
return TRUE;
|
|
|
|
}
|
2006-03-20 23:37:50 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
static bool_t xdr_dirpath(XDR *xdrs, dirpath *objp)
|
|
|
|
{
|
2010-10-22 17:05:47 +05:30
|
|
|
return xdr_string(xdrs, objp, MNTPATHLEN);
|
2006-09-15 20:42:00 +05:30
|
|
|
}
|
Major rewrite of mount, umount, losetup. Untangled lots of code, shrunk
things down a bit, fixed a number of funky corner cases, added support for
several new features (things like mount --move, mount --bind, lazy unounts,
automatic detection of loop mounts, and so on). Probably broke several
other things, but it's fixable. (Bang on it, tell me what doesn't work for
you...)
Note: you no longer need to say "-o loop". It does that for you when
necessary.
Still need to add "user mount" support, which involves making mount suid. Not
too hard to do under the new infrastructure, just haven't done it yet...
The previous code had the following notes, that belong in the version
control comments:
- * 3/21/1999 Charles P. Wright <cpwright@cpwright.com>
- * searches through fstab when -a is passed
- * will try mounting stuff with all fses when passed -t auto
- *
- * 1999-04-17 Dave Cinege...Rewrote -t auto. Fixed ro mtab.
- *
- * 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
- * dieting all around.
- *
- * 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.
- *
2005-08-11 02:05:54 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
static bool_t xdr_fhandle3(XDR *xdrs, fhandle3 *objp)
|
|
|
|
{
|
2010-10-22 17:05:47 +05:30
|
|
|
return xdr_bytes(xdrs, (char **)&objp->fhandle3_val,
|
2013-01-14 06:04:48 +05:30
|
|
|
(unsigned int *) &objp->fhandle3_len,
|
|
|
|
FHSIZE3);
|
2006-09-15 20:42:00 +05:30
|
|
|
}
|
2006-03-20 23:37:50 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
static bool_t xdr_mountres3_ok(XDR *xdrs, mountres3_ok *objp)
|
|
|
|
{
|
|
|
|
if (!xdr_fhandle3(xdrs, &objp->fhandle))
|
|
|
|
return FALSE;
|
2010-10-22 17:05:47 +05:30
|
|
|
return xdr_array(xdrs, &(objp->auth_flavours.auth_flavours_val),
|
2013-01-14 06:04:48 +05:30
|
|
|
&(objp->auth_flavours.auth_flavours_len),
|
|
|
|
~0,
|
|
|
|
sizeof(int),
|
|
|
|
(xdrproc_t) xdr_int);
|
2006-09-15 20:42:00 +05:30
|
|
|
}
|
2006-03-14 23:46:25 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
static bool_t xdr_mountstat3(XDR *xdrs, mountstat3 *objp)
|
|
|
|
{
|
2010-10-22 17:05:47 +05:30
|
|
|
return xdr_enum(xdrs, (enum_t *) objp);
|
2006-09-15 20:42:00 +05:30
|
|
|
}
|
2006-01-25 05:38:53 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
static bool_t xdr_mountres3(XDR *xdrs, mountres3 *objp)
|
|
|
|
{
|
|
|
|
if (!xdr_mountstat3(xdrs, &objp->fhs_status))
|
|
|
|
return FALSE;
|
2010-10-22 17:05:47 +05:30
|
|
|
if (objp->fhs_status == MNT_OK)
|
|
|
|
return xdr_mountres3_ok(xdrs, &objp->mountres3_u.mountinfo);
|
2006-09-15 20:42:00 +05:30
|
|
|
return TRUE;
|
|
|
|
}
|
2002-08-23 00:11:20 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
#define MAX_NFSPROT ((nfs_mount_version >= 4) ? 3 : 2)
|
2006-03-14 23:46:25 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
/*
|
|
|
|
* Unfortunately, the kernel prints annoying console messages
|
|
|
|
* in case of an unexpected nfs mount version (instead of
|
|
|
|
* just returning some error). Therefore we'll have to try
|
|
|
|
* and figure out what version the kernel expects.
|
|
|
|
*
|
|
|
|
* Variables:
|
|
|
|
* KERNEL_NFS_MOUNT_VERSION: kernel sources at compile time
|
|
|
|
* NFS_MOUNT_VERSION: these nfsmount sources at compile time
|
|
|
|
* nfs_mount_version: version this source and running kernel can handle
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
find_kernel_nfs_mount_version(void)
|
|
|
|
{
|
2007-09-28 15:59:17 +05:30
|
|
|
int kernel_version;
|
|
|
|
|
|
|
|
if (nfs_mount_version)
|
2006-09-15 20:42:00 +05:30
|
|
|
return;
|
2006-03-14 23:46:25 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
nfs_mount_version = 4; /* default */
|
2002-08-23 00:11:20 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
kernel_version = get_linux_version_code();
|
|
|
|
if (kernel_version) {
|
2009-12-16 06:36:56 +05:30
|
|
|
if (kernel_version < KERNEL_VERSION(2,2,18))
|
2006-09-15 20:42:00 +05:30
|
|
|
nfs_mount_version = 3;
|
|
|
|
/* else v4 since 2.3.99pre4 */
|
2006-08-10 01:21:13 +05:30
|
|
|
}
|
2006-09-15 20:42:00 +05:30
|
|
|
}
|
2006-03-18 08:28:11 +05:30
|
|
|
|
2007-10-14 10:25:59 +05:30
|
|
|
static void
|
2007-09-28 15:59:17 +05:30
|
|
|
get_mountport(struct pmap *pm_mnt,
|
|
|
|
struct sockaddr_in *server_addr,
|
2006-09-15 20:42:00 +05:30
|
|
|
long unsigned prog,
|
|
|
|
long unsigned version,
|
|
|
|
long unsigned proto,
|
|
|
|
long unsigned port)
|
|
|
|
{
|
|
|
|
struct pmaplist *pmap;
|
2006-03-14 23:46:25 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
server_addr->sin_port = PMAPPORT;
|
2007-02-04 08:09:55 +05:30
|
|
|
/* glibc 2.4 (still) has pmap_getmaps(struct sockaddr_in *).
|
|
|
|
* I understand it like "IPv6 for this is not 100% ready" */
|
2006-09-15 20:42:00 +05:30
|
|
|
pmap = pmap_getmaps(server_addr);
|
2006-03-14 23:46:25 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
if (version > MAX_NFSPROT)
|
|
|
|
version = MAX_NFSPROT;
|
|
|
|
if (!prog)
|
|
|
|
prog = MOUNTPROG;
|
2007-09-28 15:59:17 +05:30
|
|
|
pm_mnt->pm_prog = prog;
|
|
|
|
pm_mnt->pm_vers = version;
|
|
|
|
pm_mnt->pm_prot = proto;
|
|
|
|
pm_mnt->pm_port = port;
|
2006-09-17 21:58:10 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
while (pmap) {
|
|
|
|
if (pmap->pml_map.pm_prog != prog)
|
|
|
|
goto next;
|
2007-09-28 15:59:17 +05:30
|
|
|
if (!version && pm_mnt->pm_vers > pmap->pml_map.pm_vers)
|
2006-09-15 20:42:00 +05:30
|
|
|
goto next;
|
|
|
|
if (version > 2 && pmap->pml_map.pm_vers != version)
|
|
|
|
goto next;
|
|
|
|
if (version && version <= 2 && pmap->pml_map.pm_vers > 2)
|
|
|
|
goto next;
|
2010-01-28 06:54:24 +05:30
|
|
|
if (pmap->pml_map.pm_vers > MAX_NFSPROT
|
|
|
|
|| (proto && pm_mnt->pm_prot && pmap->pml_map.pm_prot != proto)
|
|
|
|
|| (port && pmap->pml_map.pm_port != port)
|
|
|
|
) {
|
2006-09-15 20:42:00 +05:30
|
|
|
goto next;
|
2010-01-28 06:54:24 +05:30
|
|
|
}
|
2007-09-28 15:59:17 +05:30
|
|
|
memcpy(pm_mnt, &pmap->pml_map, sizeof(*pm_mnt));
|
|
|
|
next:
|
2006-09-15 20:42:00 +05:30
|
|
|
pmap = pmap->pml_next;
|
|
|
|
}
|
2007-09-28 15:59:17 +05:30
|
|
|
if (!pm_mnt->pm_vers)
|
|
|
|
pm_mnt->pm_vers = MOUNTVERS;
|
|
|
|
if (!pm_mnt->pm_port)
|
|
|
|
pm_mnt->pm_port = MOUNTPORT;
|
|
|
|
if (!pm_mnt->pm_prot)
|
|
|
|
pm_mnt->pm_prot = IPPROTO_TCP;
|
2006-09-15 20:42:00 +05:30
|
|
|
}
|
2006-03-14 23:46:25 +05:30
|
|
|
|
2007-09-05 00:00:26 +05:30
|
|
|
#if BB_MMU
|
2006-09-15 20:42:00 +05:30
|
|
|
static int daemonize(void)
|
|
|
|
{
|
|
|
|
int pid = fork();
|
|
|
|
if (pid < 0) /* error */
|
|
|
|
return -errno;
|
|
|
|
if (pid > 0) /* parent */
|
|
|
|
return 0;
|
|
|
|
/* child */
|
2008-07-20 04:10:30 +05:30
|
|
|
close(0);
|
|
|
|
xopen(bb_dev_null, O_RDWR);
|
|
|
|
xdup2(0, 1);
|
|
|
|
xdup2(0, 2);
|
2006-09-15 20:42:00 +05:30
|
|
|
setsid();
|
2006-10-04 02:30:43 +05:30
|
|
|
openlog(applet_name, LOG_PID, LOG_DAEMON);
|
2006-09-15 20:42:00 +05:30
|
|
|
logmode = LOGMODE_SYSLOG;
|
|
|
|
return 1;
|
|
|
|
}
|
2007-09-05 00:00:26 +05:30
|
|
|
#else
|
2019-05-14 20:56:47 +05:30
|
|
|
static inline int daemonize(void)
|
|
|
|
{
|
|
|
|
return -ENOSYS;
|
|
|
|
}
|
2007-09-05 00:00:26 +05:30
|
|
|
#endif
|
2006-03-14 23:46:25 +05:30
|
|
|
|
2008-12-05 22:10:36 +05:30
|
|
|
/* TODO */
|
2008-07-05 14:48:54 +05:30
|
|
|
static inline int we_saw_this_host_before(const char *hostname UNUSED_PARAM)
|
2006-09-15 20:42:00 +05:30
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
2006-03-14 23:46:25 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
/* RPC strerror analogs are terminally idiotic:
|
|
|
|
* *mandatory* prefix and \n at end.
|
|
|
|
* This hopefully helps. Usage:
|
|
|
|
* error_msg_rpc(clnt_*error*(" ")) */
|
|
|
|
static void error_msg_rpc(const char *msg)
|
|
|
|
{
|
2006-09-19 19:37:52 +05:30
|
|
|
int len;
|
2006-09-15 20:42:00 +05:30
|
|
|
while (msg[0] == ' ' || msg[0] == ':') msg++;
|
|
|
|
len = strlen(msg);
|
|
|
|
while (len && msg[len-1] == '\n') len--;
|
|
|
|
bb_error_msg("%.*s", len, msg);
|
|
|
|
}
|
2006-03-20 23:37:50 +05:30
|
|
|
|
2008-12-05 22:10:36 +05:30
|
|
|
/* NB: mp->xxx fields may be trashed on exit */
|
2012-06-21 15:38:56 +05:30
|
|
|
static NOINLINE int nfsmount(struct mntent *mp, unsigned long vfsflags, char *filteropts)
|
2006-09-15 20:42:00 +05:30
|
|
|
{
|
|
|
|
CLIENT *mclient;
|
|
|
|
char *hostname;
|
|
|
|
char *pathname;
|
|
|
|
char *mounthost;
|
2009-05-13 20:02:32 +05:30
|
|
|
/* prior to 2.6.23, kernel took NFS options in a form of this struct
|
|
|
|
* only. 2.6.23+ looks at data->version, and if it's not 1..6,
|
|
|
|
* then data pointer is interpreted as a string. */
|
2006-09-15 20:42:00 +05:30
|
|
|
struct nfs_mount_data data;
|
|
|
|
char *opt;
|
2020-10-06 06:06:47 +05:30
|
|
|
char *tokstate;
|
2006-09-15 20:42:00 +05:30
|
|
|
struct hostent *hp;
|
|
|
|
struct sockaddr_in server_addr;
|
|
|
|
struct sockaddr_in mount_server_addr;
|
|
|
|
int msock, fsock;
|
|
|
|
union {
|
|
|
|
struct fhstatus nfsv2;
|
|
|
|
struct mountres3 nfsv3;
|
|
|
|
} status;
|
|
|
|
int daemonized;
|
|
|
|
char *s;
|
|
|
|
int port;
|
|
|
|
int mountport;
|
|
|
|
int proto;
|
2007-09-05 00:00:26 +05:30
|
|
|
#if BB_MMU
|
2008-07-20 04:10:30 +05:30
|
|
|
smallint bg = 0;
|
2007-09-05 00:00:26 +05:30
|
|
|
#else
|
|
|
|
enum { bg = 0 };
|
|
|
|
#endif
|
2006-09-15 20:42:00 +05:30
|
|
|
int retry;
|
|
|
|
int mountprog;
|
|
|
|
int mountvers;
|
|
|
|
int nfsprog;
|
|
|
|
int nfsvers;
|
|
|
|
int retval;
|
2009-05-13 20:02:32 +05:30
|
|
|
/* these all are one-bit really. gcc 4.3.1 likes this combination: */
|
2008-07-20 04:10:30 +05:30
|
|
|
smallint tcp;
|
|
|
|
smallint soft;
|
|
|
|
int intr;
|
|
|
|
int posix;
|
|
|
|
int nocto;
|
|
|
|
int noac;
|
|
|
|
int nordirplus;
|
|
|
|
int nolock;
|
2011-11-10 19:49:25 +05:30
|
|
|
int noacl;
|
Major rewrite of mount, umount, losetup. Untangled lots of code, shrunk
things down a bit, fixed a number of funky corner cases, added support for
several new features (things like mount --move, mount --bind, lazy unounts,
automatic detection of loop mounts, and so on). Probably broke several
other things, but it's fixable. (Bang on it, tell me what doesn't work for
you...)
Note: you no longer need to say "-o loop". It does that for you when
necessary.
Still need to add "user mount" support, which involves making mount suid. Not
too hard to do under the new infrastructure, just haven't done it yet...
The previous code had the following notes, that belong in the version
control comments:
- * 3/21/1999 Charles P. Wright <cpwright@cpwright.com>
- * searches through fstab when -a is passed
- * will try mounting stuff with all fses when passed -t auto
- *
- * 1999-04-17 Dave Cinege...Rewrote -t auto. Fixed ro mtab.
- *
- * 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
- * dieting all around.
- *
- * 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.
- *
2005-08-11 02:05:54 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
find_kernel_nfs_mount_version();
|
2006-03-20 23:37:50 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
daemonized = 0;
|
|
|
|
mounthost = NULL;
|
|
|
|
retval = ETIMEDOUT;
|
|
|
|
msock = fsock = -1;
|
|
|
|
mclient = NULL;
|
2006-03-20 23:37:50 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
/* NB: hostname, mounthost, filteropts must be free()d prior to return */
|
2006-03-14 23:46:25 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
filteropts = xstrdup(filteropts); /* going to trash it later... */
|
2006-03-14 23:46:25 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
hostname = xstrdup(mp->mnt_fsname);
|
|
|
|
/* mount_main() guarantees that ':' is there */
|
|
|
|
s = strchr(hostname, ':');
|
|
|
|
pathname = s + 1;
|
|
|
|
*s = '\0';
|
|
|
|
/* Ignore all but first hostname in replicated mounts
|
2011-11-10 21:23:35 +05:30
|
|
|
* until they can be fully supported. (mack@sgi.com) */
|
2006-09-15 20:42:00 +05:30
|
|
|
s = strchr(hostname, ',');
|
|
|
|
if (s) {
|
|
|
|
*s = '\0';
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg("warning: multiple hostnames not supported");
|
2006-09-15 20:42:00 +05:30
|
|
|
}
|
2006-03-14 23:46:25 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
server_addr.sin_family = AF_INET;
|
|
|
|
if (!inet_aton(hostname, &server_addr.sin_addr)) {
|
|
|
|
hp = gethostbyname(hostname);
|
|
|
|
if (hp == NULL) {
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_herror_msg(hostname);
|
2006-09-15 20:42:00 +05:30
|
|
|
goto fail;
|
2000-02-09 01:28:47 +05:30
|
|
|
}
|
2010-02-28 00:08:19 +05:30
|
|
|
if (hp->h_length != (int)sizeof(struct in_addr)) {
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg_and_die("only IPv4 is supported");
|
2006-09-15 20:42:00 +05:30
|
|
|
}
|
2010-02-28 00:08:19 +05:30
|
|
|
memcpy(&server_addr.sin_addr, hp->h_addr_list[0], sizeof(struct in_addr));
|
1999-10-05 21:54:54 +05:30
|
|
|
}
|
2006-03-14 23:46:25 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
memcpy(&mount_server_addr, &server_addr, sizeof(mount_server_addr));
|
2002-08-23 00:11:20 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
/* add IP address to mtab options for use when unmounting */
|
2006-03-20 23:37:50 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
if (!mp->mnt_opts) { /* TODO: actually mp->mnt_opts is never NULL */
|
|
|
|
mp->mnt_opts = xasprintf("addr=%s", inet_ntoa(server_addr.sin_addr));
|
|
|
|
} else {
|
|
|
|
char *tmp = xasprintf("%s%saddr=%s", mp->mnt_opts,
|
|
|
|
mp->mnt_opts[0] ? "," : "",
|
|
|
|
inet_ntoa(server_addr.sin_addr));
|
|
|
|
free(mp->mnt_opts);
|
|
|
|
mp->mnt_opts = tmp;
|
|
|
|
}
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
/* Set default options.
|
|
|
|
* rsize/wsize (and bsize, for ver >= 3) are left 0 in order to
|
|
|
|
* let the kernel decide.
|
|
|
|
* timeo is filled in after we know whether it'll be TCP or UDP. */
|
|
|
|
memset(&data, 0, sizeof(data));
|
2008-07-20 04:10:30 +05:30
|
|
|
data.retrans = 3;
|
|
|
|
data.acregmin = 3;
|
|
|
|
data.acregmax = 60;
|
|
|
|
data.acdirmin = 30;
|
|
|
|
data.acdirmax = 60;
|
|
|
|
data.namlen = NAME_MAX;
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
soft = 0;
|
|
|
|
intr = 0;
|
|
|
|
posix = 0;
|
|
|
|
nocto = 0;
|
|
|
|
nolock = 0;
|
|
|
|
noac = 0;
|
2008-07-20 04:10:30 +05:30
|
|
|
nordirplus = 0;
|
2011-11-10 19:49:25 +05:30
|
|
|
noacl = 0;
|
2006-09-15 20:42:00 +05:30
|
|
|
retry = 10000; /* 10000 minutes ~ 1 week */
|
2011-05-04 22:33:30 +05:30
|
|
|
tcp = 1; /* nfs-utils uses tcp per default */
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
mountprog = MOUNTPROG;
|
|
|
|
mountvers = 0;
|
|
|
|
port = 0;
|
|
|
|
mountport = 0;
|
|
|
|
nfsprog = 100003;
|
|
|
|
nfsvers = 0;
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
/* parse options */
|
2020-10-06 06:06:47 +05:30
|
|
|
if (filteropts) for (opt = strtok_r(filteropts, ",", &tokstate); opt; opt = strtok_r(NULL, ",", &tokstate)) {
|
2006-09-15 20:42:00 +05:30
|
|
|
char *opteq = strchr(opt, '=');
|
|
|
|
if (opteq) {
|
2008-06-25 03:09:32 +05:30
|
|
|
int val, idx;
|
2007-08-13 02:28:27 +05:30
|
|
|
static const char options[] ALIGN1 =
|
2007-07-24 21:24:42 +05:30
|
|
|
/* 0 */ "rsize\0"
|
|
|
|
/* 1 */ "wsize\0"
|
|
|
|
/* 2 */ "timeo\0"
|
|
|
|
/* 3 */ "retrans\0"
|
|
|
|
/* 4 */ "acregmin\0"
|
|
|
|
/* 5 */ "acregmax\0"
|
|
|
|
/* 6 */ "acdirmin\0"
|
|
|
|
/* 7 */ "acdirmax\0"
|
|
|
|
/* 8 */ "actimeo\0"
|
|
|
|
/* 9 */ "retry\0"
|
|
|
|
/* 10 */ "port\0"
|
|
|
|
/* 11 */ "mountport\0"
|
|
|
|
/* 12 */ "mounthost\0"
|
|
|
|
/* 13 */ "mountprog\0"
|
|
|
|
/* 14 */ "mountvers\0"
|
|
|
|
/* 15 */ "nfsprog\0"
|
|
|
|
/* 16 */ "nfsvers\0"
|
|
|
|
/* 17 */ "vers\0"
|
|
|
|
/* 18 */ "proto\0"
|
|
|
|
/* 19 */ "namlen\0"
|
|
|
|
/* 20 */ "addr\0";
|
2008-06-25 03:09:32 +05:30
|
|
|
|
|
|
|
*opteq++ = '\0';
|
|
|
|
idx = index_in_strings(options, opt);
|
|
|
|
switch (idx) {
|
|
|
|
case 12: // "mounthost"
|
|
|
|
mounthost = xstrndup(opteq,
|
|
|
|
strcspn(opteq, " \t\n\r,"));
|
|
|
|
continue;
|
|
|
|
case 18: // "proto"
|
2015-03-12 22:18:34 +05:30
|
|
|
if (is_prefixed_with(opteq, "tcp"))
|
2008-06-25 03:09:32 +05:30
|
|
|
tcp = 1;
|
2015-03-12 22:18:34 +05:30
|
|
|
else if (is_prefixed_with(opteq, "udp"))
|
2008-06-25 03:09:32 +05:30
|
|
|
tcp = 0;
|
|
|
|
else
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg("warning: unrecognized proto= option");
|
2008-06-25 03:09:32 +05:30
|
|
|
continue;
|
|
|
|
case 20: // "addr" - ignore
|
|
|
|
continue;
|
2011-02-21 22:22:13 +05:30
|
|
|
case -1: // unknown
|
|
|
|
if (vfsflags & MS_REMOUNT)
|
|
|
|
continue;
|
2008-06-25 03:09:32 +05:30
|
|
|
}
|
|
|
|
|
2010-08-12 17:44:45 +05:30
|
|
|
val = xatoi_positive(opteq);
|
2008-06-25 03:09:32 +05:30
|
|
|
switch (idx) {
|
2006-10-26 07:17:34 +05:30
|
|
|
case 0: // "rsize"
|
2006-09-15 20:42:00 +05:30
|
|
|
data.rsize = val;
|
2008-06-25 03:09:32 +05:30
|
|
|
continue;
|
2006-10-26 07:17:34 +05:30
|
|
|
case 1: // "wsize"
|
2006-09-15 20:42:00 +05:30
|
|
|
data.wsize = val;
|
2008-06-25 03:09:32 +05:30
|
|
|
continue;
|
2006-10-26 07:17:34 +05:30
|
|
|
case 2: // "timeo"
|
2006-09-15 20:42:00 +05:30
|
|
|
data.timeo = val;
|
2008-06-25 03:09:32 +05:30
|
|
|
continue;
|
2006-10-26 07:17:34 +05:30
|
|
|
case 3: // "retrans"
|
2006-09-15 20:42:00 +05:30
|
|
|
data.retrans = val;
|
2008-06-25 03:09:32 +05:30
|
|
|
continue;
|
2006-10-26 07:17:34 +05:30
|
|
|
case 4: // "acregmin"
|
2006-09-15 20:42:00 +05:30
|
|
|
data.acregmin = val;
|
2008-06-25 03:09:32 +05:30
|
|
|
continue;
|
2006-10-26 07:17:34 +05:30
|
|
|
case 5: // "acregmax"
|
2006-09-15 20:42:00 +05:30
|
|
|
data.acregmax = val;
|
2008-06-25 03:09:32 +05:30
|
|
|
continue;
|
2006-10-26 07:17:34 +05:30
|
|
|
case 6: // "acdirmin"
|
2006-09-15 20:42:00 +05:30
|
|
|
data.acdirmin = val;
|
2008-06-25 03:09:32 +05:30
|
|
|
continue;
|
2006-10-26 07:17:34 +05:30
|
|
|
case 7: // "acdirmax"
|
2006-09-15 20:42:00 +05:30
|
|
|
data.acdirmax = val;
|
2008-06-25 03:09:32 +05:30
|
|
|
continue;
|
2006-10-26 07:17:34 +05:30
|
|
|
case 8: // "actimeo"
|
2006-09-15 20:42:00 +05:30
|
|
|
data.acregmin = val;
|
|
|
|
data.acregmax = val;
|
|
|
|
data.acdirmin = val;
|
|
|
|
data.acdirmax = val;
|
2008-06-25 03:09:32 +05:30
|
|
|
continue;
|
2006-10-26 07:17:34 +05:30
|
|
|
case 9: // "retry"
|
2006-09-15 20:42:00 +05:30
|
|
|
retry = val;
|
2008-06-25 03:09:32 +05:30
|
|
|
continue;
|
2006-10-26 07:17:34 +05:30
|
|
|
case 10: // "port"
|
2006-09-15 20:42:00 +05:30
|
|
|
port = val;
|
2008-06-25 03:09:32 +05:30
|
|
|
continue;
|
2006-10-26 07:17:34 +05:30
|
|
|
case 11: // "mountport"
|
2006-09-15 20:42:00 +05:30
|
|
|
mountport = val;
|
2008-06-25 03:09:32 +05:30
|
|
|
continue;
|
2006-10-26 07:17:34 +05:30
|
|
|
case 13: // "mountprog"
|
2006-09-15 20:42:00 +05:30
|
|
|
mountprog = val;
|
2008-06-25 03:09:32 +05:30
|
|
|
continue;
|
2006-10-26 07:17:34 +05:30
|
|
|
case 14: // "mountvers"
|
2006-09-15 20:42:00 +05:30
|
|
|
mountvers = val;
|
2008-06-25 03:09:32 +05:30
|
|
|
continue;
|
2006-10-26 07:17:34 +05:30
|
|
|
case 15: // "nfsprog"
|
2006-09-15 20:42:00 +05:30
|
|
|
nfsprog = val;
|
2008-06-25 03:09:32 +05:30
|
|
|
continue;
|
2006-10-26 07:17:34 +05:30
|
|
|
case 16: // "nfsvers"
|
|
|
|
case 17: // "vers"
|
2006-09-15 20:42:00 +05:30
|
|
|
nfsvers = val;
|
2008-06-25 03:09:32 +05:30
|
|
|
continue;
|
2006-10-26 07:17:34 +05:30
|
|
|
case 19: // "namlen"
|
2008-06-25 03:09:32 +05:30
|
|
|
//if (nfs_mount_version >= 2)
|
2006-09-15 20:42:00 +05:30
|
|
|
data.namlen = val;
|
2008-06-25 03:09:32 +05:30
|
|
|
//else
|
|
|
|
// bb_error_msg("warning: option namlen is not supported\n");
|
|
|
|
continue;
|
2006-10-26 07:17:34 +05:30
|
|
|
default:
|
2006-09-15 20:42:00 +05:30
|
|
|
bb_error_msg("unknown nfs mount parameter: %s=%d", opt, val);
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
}
|
2008-06-25 03:09:32 +05:30
|
|
|
else { /* not of the form opt=val */
|
2007-08-13 02:28:27 +05:30
|
|
|
static const char options[] ALIGN1 =
|
2007-07-24 21:24:42 +05:30
|
|
|
"bg\0"
|
|
|
|
"fg\0"
|
|
|
|
"soft\0"
|
|
|
|
"hard\0"
|
|
|
|
"intr\0"
|
|
|
|
"posix\0"
|
|
|
|
"cto\0"
|
|
|
|
"ac\0"
|
|
|
|
"tcp\0"
|
|
|
|
"udp\0"
|
2008-07-20 04:10:30 +05:30
|
|
|
"lock\0"
|
2011-11-10 19:49:25 +05:30
|
|
|
"rdirplus\0"
|
2012-04-20 18:37:22 +05:30
|
|
|
"acl\0";
|
2006-09-15 20:42:00 +05:30
|
|
|
int val = 1;
|
2015-03-12 22:18:34 +05:30
|
|
|
if (is_prefixed_with(opt, "no")) {
|
2006-09-15 20:42:00 +05:30
|
|
|
val = 0;
|
|
|
|
opt += 2;
|
|
|
|
}
|
2007-07-24 21:24:42 +05:30
|
|
|
switch (index_in_strings(options, opt)) {
|
2006-10-26 07:17:34 +05:30
|
|
|
case 0: // "bg"
|
2007-09-05 00:00:26 +05:30
|
|
|
#if BB_MMU
|
2006-09-15 20:42:00 +05:30
|
|
|
bg = val;
|
2007-09-05 00:00:26 +05:30
|
|
|
#endif
|
2006-10-26 07:17:34 +05:30
|
|
|
break;
|
|
|
|
case 1: // "fg"
|
2007-09-05 00:00:26 +05:30
|
|
|
#if BB_MMU
|
2006-09-15 20:42:00 +05:30
|
|
|
bg = !val;
|
2007-09-05 00:00:26 +05:30
|
|
|
#endif
|
2006-10-26 07:17:34 +05:30
|
|
|
break;
|
|
|
|
case 2: // "soft"
|
2006-09-15 20:42:00 +05:30
|
|
|
soft = val;
|
2006-10-26 07:17:34 +05:30
|
|
|
break;
|
|
|
|
case 3: // "hard"
|
2006-09-15 20:42:00 +05:30
|
|
|
soft = !val;
|
2006-10-26 07:17:34 +05:30
|
|
|
break;
|
|
|
|
case 4: // "intr"
|
2006-09-15 20:42:00 +05:30
|
|
|
intr = val;
|
2006-10-26 07:17:34 +05:30
|
|
|
break;
|
|
|
|
case 5: // "posix"
|
2006-09-15 20:42:00 +05:30
|
|
|
posix = val;
|
2006-10-26 07:17:34 +05:30
|
|
|
break;
|
|
|
|
case 6: // "cto"
|
2006-09-15 20:42:00 +05:30
|
|
|
nocto = !val;
|
2006-10-26 07:17:34 +05:30
|
|
|
break;
|
|
|
|
case 7: // "ac"
|
2006-09-15 20:42:00 +05:30
|
|
|
noac = !val;
|
2006-10-26 07:17:34 +05:30
|
|
|
break;
|
|
|
|
case 8: // "tcp"
|
2006-09-15 20:42:00 +05:30
|
|
|
tcp = val;
|
2006-10-26 07:17:34 +05:30
|
|
|
break;
|
|
|
|
case 9: // "udp"
|
2006-09-15 20:42:00 +05:30
|
|
|
tcp = !val;
|
2006-10-26 07:17:34 +05:30
|
|
|
break;
|
|
|
|
case 10: // "lock"
|
2006-09-15 20:42:00 +05:30
|
|
|
if (nfs_mount_version >= 3)
|
|
|
|
nolock = !val;
|
|
|
|
else
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg("warning: option nolock is not supported");
|
2006-10-26 07:17:34 +05:30
|
|
|
break;
|
2008-07-20 04:10:30 +05:30
|
|
|
case 11: //rdirplus
|
|
|
|
nordirplus = !val;
|
|
|
|
break;
|
2011-11-10 19:49:25 +05:30
|
|
|
case 12: // acl
|
2012-04-20 18:37:22 +05:30
|
|
|
noacl = !val;
|
2011-11-10 19:49:25 +05:30
|
|
|
break;
|
2006-10-26 07:17:34 +05:30
|
|
|
default:
|
2006-09-15 20:42:00 +05:30
|
|
|
bb_error_msg("unknown nfs mount option: %s%s", val ? "" : "no", opt);
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
proto = (tcp) ? IPPROTO_TCP : IPPROTO_UDP;
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
data.flags = (soft ? NFS_MOUNT_SOFT : 0)
|
|
|
|
| (intr ? NFS_MOUNT_INTR : 0)
|
|
|
|
| (posix ? NFS_MOUNT_POSIX : 0)
|
|
|
|
| (nocto ? NFS_MOUNT_NOCTO : 0)
|
2008-07-20 04:10:30 +05:30
|
|
|
| (noac ? NFS_MOUNT_NOAC : 0)
|
2011-11-10 19:49:25 +05:30
|
|
|
| (nordirplus ? NFS_MOUNT_NORDIRPLUS : 0)
|
2012-04-20 18:37:22 +05:30
|
|
|
| (noacl ? NFS_MOUNT_NOACL : 0);
|
2006-09-15 20:42:00 +05:30
|
|
|
if (nfs_mount_version >= 2)
|
|
|
|
data.flags |= (tcp ? NFS_MOUNT_TCP : 0);
|
|
|
|
if (nfs_mount_version >= 3)
|
|
|
|
data.flags |= (nolock ? NFS_MOUNT_NONLM : 0);
|
|
|
|
if (nfsvers > MAX_NFSPROT || mountvers > MAX_NFSPROT) {
|
|
|
|
bb_error_msg("NFSv%d not supported", nfsvers);
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
if (nfsvers && !mountvers)
|
|
|
|
mountvers = (nfsvers < 3) ? 1 : nfsvers;
|
|
|
|
if (nfsvers && nfsvers < mountvers) {
|
|
|
|
mountvers = nfsvers;
|
|
|
|
}
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
/* Adjust options if none specified */
|
|
|
|
if (!data.timeo)
|
|
|
|
data.timeo = tcp ? 70 : 7;
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
data.version = nfs_mount_version;
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
if (vfsflags & MS_REMOUNT)
|
|
|
|
goto do_mount;
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
/*
|
|
|
|
* If the previous mount operation on the same host was
|
|
|
|
* backgrounded, and the "bg" for this mount is also set,
|
|
|
|
* give up immediately, to avoid the initial timeout.
|
|
|
|
*/
|
|
|
|
if (bg && we_saw_this_host_before(hostname)) {
|
2007-08-28 16:53:23 +05:30
|
|
|
daemonized = daemonize();
|
2006-09-15 20:42:00 +05:30
|
|
|
if (daemonized <= 0) { /* parent or error */
|
|
|
|
retval = -daemonized;
|
|
|
|
goto ret;
|
|
|
|
}
|
|
|
|
}
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2008-12-05 22:10:36 +05:30
|
|
|
/* Create mount daemon client */
|
2006-09-15 20:42:00 +05:30
|
|
|
/* See if the nfs host = mount host. */
|
|
|
|
if (mounthost) {
|
|
|
|
if (mounthost[0] >= '0' && mounthost[0] <= '9') {
|
|
|
|
mount_server_addr.sin_family = AF_INET;
|
|
|
|
mount_server_addr.sin_addr.s_addr = inet_addr(hostname);
|
|
|
|
} else {
|
|
|
|
hp = gethostbyname(mounthost);
|
|
|
|
if (hp == NULL) {
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_herror_msg(mounthost);
|
2006-09-15 20:42:00 +05:30
|
|
|
goto fail;
|
|
|
|
}
|
2010-02-28 00:08:19 +05:30
|
|
|
if (hp->h_length != (int)sizeof(struct in_addr)) {
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg_and_die("only IPv4 is supported");
|
2008-05-13 07:57:31 +05:30
|
|
|
}
|
|
|
|
mount_server_addr.sin_family = AF_INET;
|
2010-02-28 00:08:19 +05:30
|
|
|
memcpy(&mount_server_addr.sin_addr, hp->h_addr_list[0], sizeof(struct in_addr));
|
2006-09-15 20:42:00 +05:30
|
|
|
}
|
|
|
|
}
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
/*
|
|
|
|
* The following loop implements the mount retries. When the mount
|
|
|
|
* times out, and the "bg" option is set, we background ourself
|
|
|
|
* and continue trying.
|
|
|
|
*
|
|
|
|
* The case where the mount point is not present and the "bg"
|
|
|
|
* option is set, is treated as a timeout. This is done to
|
|
|
|
* support nested mounts.
|
|
|
|
*
|
|
|
|
* The "retry" count specified by the user is the number of
|
|
|
|
* minutes to retry before giving up.
|
|
|
|
*/
|
|
|
|
{
|
|
|
|
struct timeval total_timeout;
|
|
|
|
struct timeval retry_timeout;
|
2007-09-28 15:59:17 +05:30
|
|
|
struct pmap pm_mnt;
|
2006-09-15 20:42:00 +05:30
|
|
|
time_t t;
|
|
|
|
time_t prevt;
|
|
|
|
time_t timeout;
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
retry_timeout.tv_sec = 3;
|
|
|
|
retry_timeout.tv_usec = 0;
|
|
|
|
total_timeout.tv_sec = 20;
|
|
|
|
total_timeout.tv_usec = 0;
|
2008-12-05 22:10:36 +05:30
|
|
|
/* FIXME: use monotonic()? */
|
2006-09-15 20:42:00 +05:30
|
|
|
timeout = time(NULL) + 60 * retry;
|
|
|
|
prevt = 0;
|
|
|
|
t = 30;
|
2007-10-30 00:48:39 +05:30
|
|
|
retry:
|
2008-12-05 22:10:36 +05:30
|
|
|
/* Be careful not to use too many CPU cycles */
|
2006-09-15 20:42:00 +05:30
|
|
|
if (t - prevt < 30)
|
|
|
|
sleep(30);
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2007-09-28 15:59:17 +05:30
|
|
|
get_mountport(&pm_mnt, &mount_server_addr,
|
2006-09-15 20:42:00 +05:30
|
|
|
mountprog,
|
|
|
|
mountvers,
|
|
|
|
proto,
|
|
|
|
mountport);
|
2007-09-28 15:59:17 +05:30
|
|
|
nfsvers = (pm_mnt.pm_vers < 2) ? 2 : pm_mnt.pm_vers;
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
/* contact the mount daemon via TCP */
|
2007-09-28 15:59:17 +05:30
|
|
|
mount_server_addr.sin_port = htons(pm_mnt.pm_port);
|
2006-09-15 20:42:00 +05:30
|
|
|
msock = RPC_ANYSOCK;
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2007-09-28 15:59:17 +05:30
|
|
|
switch (pm_mnt.pm_prot) {
|
2006-09-15 20:42:00 +05:30
|
|
|
case IPPROTO_UDP:
|
|
|
|
mclient = clntudp_create(&mount_server_addr,
|
2013-01-14 06:04:48 +05:30
|
|
|
pm_mnt.pm_prog,
|
|
|
|
pm_mnt.pm_vers,
|
|
|
|
retry_timeout,
|
|
|
|
&msock);
|
2006-09-15 20:42:00 +05:30
|
|
|
if (mclient)
|
|
|
|
break;
|
2007-09-28 15:59:17 +05:30
|
|
|
mount_server_addr.sin_port = htons(pm_mnt.pm_port);
|
2006-09-15 20:42:00 +05:30
|
|
|
msock = RPC_ANYSOCK;
|
|
|
|
case IPPROTO_TCP:
|
|
|
|
mclient = clnttcp_create(&mount_server_addr,
|
2013-01-14 06:04:48 +05:30
|
|
|
pm_mnt.pm_prog,
|
|
|
|
pm_mnt.pm_vers,
|
|
|
|
&msock, 0, 0);
|
2006-09-15 20:42:00 +05:30
|
|
|
break;
|
|
|
|
default:
|
2007-08-28 16:53:23 +05:30
|
|
|
mclient = NULL;
|
2006-09-15 20:42:00 +05:30
|
|
|
}
|
|
|
|
if (!mclient) {
|
|
|
|
if (!daemonized && prevt == 0)
|
|
|
|
error_msg_rpc(clnt_spcreateerror(" "));
|
|
|
|
} else {
|
|
|
|
enum clnt_stat clnt_stat;
|
2008-12-05 22:10:36 +05:30
|
|
|
|
|
|
|
/* Try to mount hostname:pathname */
|
2006-09-15 20:42:00 +05:30
|
|
|
mclient->cl_auth = authunix_create_default();
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2008-12-05 22:10:36 +05:30
|
|
|
/* Make pointers in xdr_mountres3 NULL so
|
2006-09-15 20:42:00 +05:30
|
|
|
* that xdr_array allocates memory for us
|
|
|
|
*/
|
|
|
|
memset(&status, 0, sizeof(status));
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2007-09-28 15:59:17 +05:30
|
|
|
if (pm_mnt.pm_vers == 3)
|
2006-09-15 20:42:00 +05:30
|
|
|
clnt_stat = clnt_call(mclient, MOUNTPROC3_MNT,
|
2013-01-14 06:04:48 +05:30
|
|
|
(xdrproc_t) xdr_dirpath,
|
|
|
|
(caddr_t) &pathname,
|
|
|
|
(xdrproc_t) xdr_mountres3,
|
|
|
|
(caddr_t) &status,
|
|
|
|
total_timeout);
|
2006-09-15 20:42:00 +05:30
|
|
|
else
|
|
|
|
clnt_stat = clnt_call(mclient, MOUNTPROC_MNT,
|
2013-01-14 06:04:48 +05:30
|
|
|
(xdrproc_t) xdr_dirpath,
|
|
|
|
(caddr_t) &pathname,
|
|
|
|
(xdrproc_t) xdr_fhstatus,
|
|
|
|
(caddr_t) &status,
|
|
|
|
total_timeout);
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
if (clnt_stat == RPC_SUCCESS)
|
|
|
|
goto prepare_kernel_data; /* we're done */
|
|
|
|
if (errno != ECONNREFUSED) {
|
|
|
|
error_msg_rpc(clnt_sperror(mclient, " "));
|
|
|
|
goto fail; /* don't retry */
|
|
|
|
}
|
|
|
|
/* Connection refused */
|
|
|
|
if (!daemonized && prevt == 0) /* print just once */
|
|
|
|
error_msg_rpc(clnt_sperror(mclient, " "));
|
|
|
|
auth_destroy(mclient->cl_auth);
|
|
|
|
clnt_destroy(mclient);
|
2007-08-28 16:53:23 +05:30
|
|
|
mclient = NULL;
|
2006-09-15 20:42:00 +05:30
|
|
|
close(msock);
|
2007-08-28 16:53:23 +05:30
|
|
|
msock = -1;
|
2006-09-15 20:42:00 +05:30
|
|
|
}
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
/* Timeout. We are going to retry... maybe */
|
|
|
|
if (!bg)
|
|
|
|
goto fail;
|
|
|
|
if (!daemonized) {
|
|
|
|
daemonized = daemonize();
|
|
|
|
if (daemonized <= 0) { /* parent or error */
|
|
|
|
retval = -daemonized;
|
|
|
|
goto ret;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
prevt = t;
|
|
|
|
t = time(NULL);
|
|
|
|
if (t >= timeout)
|
|
|
|
/* TODO error message */
|
|
|
|
goto fail;
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
goto retry;
|
2006-09-14 21:16:33 +05:30
|
|
|
}
|
|
|
|
|
2007-10-30 00:48:39 +05:30
|
|
|
prepare_kernel_data:
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
if (nfsvers == 2) {
|
|
|
|
if (status.nfsv2.fhs_status != 0) {
|
|
|
|
bb_error_msg("%s:%s failed, reason given by server: %s",
|
|
|
|
hostname, pathname,
|
|
|
|
nfs_strerror(status.nfsv2.fhs_status));
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
memcpy(data.root.data,
|
|
|
|
(char *) status.nfsv2.fhstatus_u.fhs_fhandle,
|
|
|
|
NFS_FHSIZE);
|
|
|
|
data.root.size = NFS_FHSIZE;
|
|
|
|
memcpy(data.old_root.data,
|
|
|
|
(char *) status.nfsv2.fhstatus_u.fhs_fhandle,
|
|
|
|
NFS_FHSIZE);
|
|
|
|
} else {
|
|
|
|
fhandle3 *my_fhandle;
|
|
|
|
if (status.nfsv3.fhs_status != 0) {
|
|
|
|
bb_error_msg("%s:%s failed, reason given by server: %s",
|
|
|
|
hostname, pathname,
|
|
|
|
nfs_strerror(status.nfsv3.fhs_status));
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
my_fhandle = &status.nfsv3.mountres3_u.mountinfo.fhandle;
|
|
|
|
memset(data.old_root.data, 0, NFS_FHSIZE);
|
|
|
|
memset(&data.root, 0, sizeof(data.root));
|
|
|
|
data.root.size = my_fhandle->fhandle3_len;
|
|
|
|
memcpy(data.root.data,
|
|
|
|
(char *) my_fhandle->fhandle3_val,
|
|
|
|
my_fhandle->fhandle3_len);
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
data.flags |= NFS_MOUNT_VER3;
|
|
|
|
}
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2008-12-05 22:10:36 +05:30
|
|
|
/* Create nfs socket for kernel */
|
2006-09-15 20:42:00 +05:30
|
|
|
if (tcp) {
|
|
|
|
if (nfs_mount_version < 3) {
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg("NFS over TCP is not supported");
|
2006-09-15 20:42:00 +05:30
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
fsock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
|
|
|
|
} else
|
|
|
|
fsock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
|
|
|
|
if (fsock < 0) {
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_perror_msg("nfs socket");
|
2006-09-15 20:42:00 +05:30
|
|
|
goto fail;
|
2006-09-14 21:16:33 +05:30
|
|
|
}
|
2006-09-15 20:42:00 +05:30
|
|
|
if (bindresvport(fsock, 0) < 0) {
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_perror_msg("nfs bindresvport");
|
2006-09-15 20:42:00 +05:30
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
if (port == 0) {
|
|
|
|
server_addr.sin_port = PMAPPORT;
|
|
|
|
port = pmap_getport(&server_addr, nfsprog, nfsvers,
|
|
|
|
tcp ? IPPROTO_TCP : IPPROTO_UDP);
|
|
|
|
if (port == 0)
|
|
|
|
port = NFS_PORT;
|
|
|
|
}
|
|
|
|
server_addr.sin_port = htons(port);
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2008-12-05 22:10:36 +05:30
|
|
|
/* Prepare data structure for kernel */
|
2006-09-15 20:42:00 +05:30
|
|
|
data.fd = fsock;
|
|
|
|
memcpy((char *) &data.addr, (char *) &server_addr, sizeof(data.addr));
|
|
|
|
strncpy(data.hostname, hostname, sizeof(data.hostname));
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2008-12-05 22:10:36 +05:30
|
|
|
/* Clean up */
|
2006-09-15 20:42:00 +05:30
|
|
|
auth_destroy(mclient->cl_auth);
|
|
|
|
clnt_destroy(mclient);
|
|
|
|
close(msock);
|
2007-08-28 16:53:23 +05:30
|
|
|
msock = -1;
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
if (bg) {
|
|
|
|
/* We must wait until mount directory is available */
|
|
|
|
struct stat statbuf;
|
|
|
|
int delay = 1;
|
|
|
|
while (stat(mp->mnt_dir, &statbuf) == -1) {
|
|
|
|
if (!daemonized) {
|
|
|
|
daemonized = daemonize();
|
|
|
|
if (daemonized <= 0) { /* parent or error */
|
2008-12-05 22:10:36 +05:30
|
|
|
/* FIXME: parent doesn't close fsock - ??! */
|
2006-09-15 20:42:00 +05:30
|
|
|
retval = -daemonized;
|
|
|
|
goto ret;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
sleep(delay); /* 1, 2, 4, 8, 16, 30, ... */
|
|
|
|
delay *= 2;
|
|
|
|
if (delay > 30)
|
|
|
|
delay = 30;
|
|
|
|
}
|
2006-09-14 21:16:33 +05:30
|
|
|
}
|
|
|
|
|
2008-12-05 22:10:36 +05:30
|
|
|
/* Perform actual mount */
|
|
|
|
do_mount:
|
2006-09-15 20:42:00 +05:30
|
|
|
retval = mount_it_now(mp, vfsflags, (char*)&data);
|
|
|
|
goto ret;
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2008-12-05 22:10:36 +05:30
|
|
|
/* Abort */
|
|
|
|
fail:
|
2007-08-28 16:53:23 +05:30
|
|
|
if (msock >= 0) {
|
2006-09-15 20:42:00 +05:30
|
|
|
if (mclient) {
|
|
|
|
auth_destroy(mclient->cl_auth);
|
|
|
|
clnt_destroy(mclient);
|
|
|
|
}
|
|
|
|
close(msock);
|
2006-09-14 21:16:33 +05:30
|
|
|
}
|
2007-08-28 16:53:23 +05:30
|
|
|
if (fsock >= 0)
|
2006-09-15 20:42:00 +05:30
|
|
|
close(fsock);
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2007-10-30 00:48:39 +05:30
|
|
|
ret:
|
2006-09-15 20:42:00 +05:30
|
|
|
free(hostname);
|
|
|
|
free(mounthost);
|
|
|
|
free(filteropts);
|
|
|
|
return retval;
|
2006-09-14 21:16:33 +05:30
|
|
|
}
|
|
|
|
|
2008-12-05 22:10:36 +05:30
|
|
|
#else // !ENABLE_FEATURE_MOUNT_NFS
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2011-11-10 21:23:35 +05:30
|
|
|
/* Linux 2.6.23+ supports nfs mounts with options passed as a string.
|
|
|
|
* For older kernels, you must build busybox with ENABLE_FEATURE_MOUNT_NFS.
|
|
|
|
* (However, note that then you lose any chances that NFS over IPv6 would work).
|
|
|
|
*/
|
2012-06-21 15:38:56 +05:30
|
|
|
static int nfsmount(struct mntent *mp, unsigned long vfsflags, char *filteropts)
|
2011-11-10 21:23:35 +05:30
|
|
|
{
|
|
|
|
len_and_sockaddr *lsa;
|
|
|
|
char *opts;
|
|
|
|
char *end;
|
|
|
|
char *dotted;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
# if ENABLE_FEATURE_IPV6
|
|
|
|
end = strchr(mp->mnt_fsname, ']');
|
|
|
|
if (end && end[1] == ':')
|
|
|
|
end++;
|
|
|
|
else
|
|
|
|
# endif
|
|
|
|
/* mount_main() guarantees that ':' is there */
|
|
|
|
end = strchr(mp->mnt_fsname, ':');
|
|
|
|
|
|
|
|
*end = '\0';
|
2011-11-10 21:31:39 +05:30
|
|
|
lsa = xhost2sockaddr(mp->mnt_fsname, /*port:*/ 0);
|
2011-11-10 21:23:35 +05:30
|
|
|
*end = ':';
|
|
|
|
dotted = xmalloc_sockaddr2dotted_noport(&lsa->u.sa);
|
|
|
|
if (ENABLE_FEATURE_CLEAN_UP) free(lsa);
|
|
|
|
opts = xasprintf("%s%saddr=%s",
|
|
|
|
filteropts ? filteropts : "",
|
|
|
|
filteropts ? "," : "",
|
|
|
|
dotted
|
|
|
|
);
|
|
|
|
if (ENABLE_FEATURE_CLEAN_UP) free(dotted);
|
|
|
|
ret = mount_it_now(mp, vfsflags, opts);
|
|
|
|
if (ENABLE_FEATURE_CLEAN_UP) free(opts);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2008-12-05 22:10:36 +05:30
|
|
|
#endif // !ENABLE_FEATURE_MOUNT_NFS
|
2006-09-15 20:42:00 +05:30
|
|
|
|
2020-07-29 14:13:53 +05:30
|
|
|
// Find "...,NAME=NUM,..." in the option string, remove "NAME=NUM" option
|
|
|
|
// and return NUM.
|
|
|
|
// Return 0 if not found.
|
|
|
|
// All instances must be parsed and removed (for example, since kernel 5.4
|
|
|
|
// squashfs: Unknown parameter 'sizelimit'
|
|
|
|
// will result if loopback mount option "sizelimit=NNN" is not removed
|
|
|
|
// and squashfs sees it in option string).
|
|
|
|
static unsigned long long cut_out_ull_opt(char *opts, const char *name_eq)
|
|
|
|
{
|
|
|
|
unsigned long long ret = 0;
|
|
|
|
|
|
|
|
if (!opts) // allow NULL opts (simplifies callers' work)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
char *end;
|
|
|
|
char *opt;
|
|
|
|
|
|
|
|
// Find comma-delimited "NAME="
|
|
|
|
for (;;) {
|
|
|
|
opt = strstr(opts, name_eq);
|
|
|
|
if (!opt)
|
|
|
|
return ret;
|
|
|
|
if (opt == opts)
|
|
|
|
break; // found it (it's first opt)
|
|
|
|
if (opt[-1] == ',') {
|
|
|
|
opts = opt - 1;
|
|
|
|
break; // found it (it's not a first opt)
|
|
|
|
}
|
|
|
|
// False positive like "VNAME=", we are at "N".
|
|
|
|
// - skip it, loop back to searching
|
|
|
|
opts = opt + 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = bb_strtoull(opt + strlen(name_eq), &end, 0);
|
|
|
|
if (errno && errno != EINVAL) {
|
|
|
|
err:
|
|
|
|
bb_error_msg_and_die("bad option '%s'", opt);
|
|
|
|
}
|
|
|
|
if (*end == '\0') {
|
|
|
|
// It is "[,]NAME=NUM\0" - truncate it and return
|
|
|
|
*opts = '\0';
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
if (*end != ',')
|
|
|
|
goto err;
|
|
|
|
// We are at trailing comma
|
|
|
|
// Remove "NAME=NUM," and loop back to check for duplicate opts
|
|
|
|
overlapping_strcpy(opt, end + 1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
// Mount one directory. Handles CIFS, NFS, loopback, autobind, and filesystem
|
|
|
|
// type detection. Returns 0 for success, nonzero for failure.
|
2006-09-17 20:34:01 +05:30
|
|
|
// NB: mp->xxx fields may be trashed on exit
|
2006-09-15 20:42:00 +05:30
|
|
|
static int singlemount(struct mntent *mp, int ignore_busy)
|
2006-09-14 21:16:33 +05:30
|
|
|
{
|
2017-03-16 21:19:37 +05:30
|
|
|
int loopfd = -1;
|
2008-02-18 18:35:38 +05:30
|
|
|
int rc = -1;
|
2012-06-21 15:38:56 +05:30
|
|
|
unsigned long vfsflags;
|
2009-06-19 15:18:29 +05:30
|
|
|
char *loopFile = NULL, *filteropts = NULL;
|
|
|
|
llist_t *fl = NULL;
|
2006-09-15 20:42:00 +05:30
|
|
|
struct stat st;
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2009-12-15 21:06:14 +05:30
|
|
|
errno = 0;
|
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
vfsflags = parse_mount_options(mp->mnt_opts, &filteropts);
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2008-12-05 22:10:36 +05:30
|
|
|
// Treat fstype "auto" as unspecified
|
2008-03-17 14:16:43 +05:30
|
|
|
if (mp->mnt_type && strcmp(mp->mnt_type, "auto") == 0)
|
|
|
|
mp->mnt_type = NULL;
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2007-09-15 18:58:30 +05:30
|
|
|
// Might this be a virtual filesystem?
|
2009-06-19 15:18:29 +05:30
|
|
|
if (ENABLE_FEATURE_MOUNT_HELPERS && strchr(mp->mnt_fsname, '#')) {
|
|
|
|
char *args[35];
|
|
|
|
char *s;
|
|
|
|
int n;
|
|
|
|
// fsname: "cmd#arg1#arg2..."
|
|
|
|
// WARNING: allows execution of arbitrary commands!
|
|
|
|
// Try "mount 'sh#-c#sh' bogus_dir".
|
|
|
|
// It is safe ONLY because non-root
|
|
|
|
// cannot use two-argument mount command
|
|
|
|
// and using one-argument "mount 'sh#-c#sh'" doesn't work:
|
|
|
|
// "mount: can't find sh#-c#sh in /etc/fstab"
|
|
|
|
// (if /etc/fstab has it, it's ok: root sets up /etc/fstab).
|
|
|
|
|
|
|
|
s = mp->mnt_fsname;
|
|
|
|
n = 0;
|
|
|
|
args[n++] = s;
|
|
|
|
while (*s && n < 35 - 2) {
|
|
|
|
if (*s++ == '#' && *s != '#') {
|
|
|
|
s[-1] = '\0';
|
|
|
|
args[n++] = s;
|
2007-09-15 18:58:30 +05:30
|
|
|
}
|
|
|
|
}
|
|
|
|
args[n++] = mp->mnt_dir;
|
|
|
|
args[n] = NULL;
|
2010-03-19 03:14:00 +05:30
|
|
|
rc = spawn_and_wait(args);
|
2007-09-15 18:58:30 +05:30
|
|
|
goto report_error;
|
|
|
|
}
|
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
// Might this be an CIFS filesystem?
|
2007-01-22 19:36:03 +05:30
|
|
|
if (ENABLE_FEATURE_MOUNT_CIFS
|
2008-03-17 14:16:43 +05:30
|
|
|
&& (!mp->mnt_type || strcmp(mp->mnt_type, "cifs") == 0)
|
|
|
|
&& (mp->mnt_fsname[0] == '/' || mp->mnt_fsname[0] == '\\')
|
|
|
|
&& mp->mnt_fsname[0] == mp->mnt_fsname[1]
|
2007-01-22 19:36:03 +05:30
|
|
|
) {
|
2009-12-15 05:58:59 +05:30
|
|
|
int len;
|
|
|
|
char c;
|
2013-01-17 07:00:35 +05:30
|
|
|
char *hostname, *share;
|
2007-02-04 08:09:55 +05:30
|
|
|
len_and_sockaddr *lsa;
|
2013-01-17 07:00:35 +05:30
|
|
|
|
|
|
|
// Parse mp->mnt_fsname of the form "//hostname/share[/dir1/dir2]"
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2009-12-15 21:06:14 +05:30
|
|
|
hostname = mp->mnt_fsname + 2;
|
|
|
|
len = strcspn(hostname, "/\\");
|
2013-01-17 07:00:35 +05:30
|
|
|
share = hostname + len + 1;
|
|
|
|
if (len == 0 // 3rd char is a [back]slash (IOW: empty hostname)
|
|
|
|
|| share[-1] == '\0' // no [back]slash after hostname
|
|
|
|
|| share[0] == '\0' // empty share name
|
2013-01-16 05:17:19 +05:30
|
|
|
) {
|
2009-04-12 17:46:21 +05:30
|
|
|
goto report_error;
|
2013-01-16 05:17:19 +05:30
|
|
|
}
|
2013-01-17 07:00:35 +05:30
|
|
|
c = share[-1];
|
|
|
|
share[-1] = '\0';
|
|
|
|
len = strcspn(share, "/\\");
|
2013-01-16 05:17:19 +05:30
|
|
|
|
|
|
|
// "unc=\\hostname\share" option is mandatory
|
|
|
|
// after CIFS option parsing was rewritten in Linux 3.4.
|
2013-01-17 07:00:35 +05:30
|
|
|
// Must use backslashes.
|
|
|
|
// If /dir1/dir2 is present, also add "prefixpath=dir1/dir2"
|
2013-01-16 05:17:19 +05:30
|
|
|
{
|
2013-01-17 07:00:35 +05:30
|
|
|
char *unc = xasprintf(
|
|
|
|
share[len] != '\0' /* "/dir1/dir2" exists? */
|
|
|
|
? "unc=\\\\%s\\%.*s,prefixpath=%s"
|
|
|
|
: "unc=\\\\%s\\%.*s",
|
|
|
|
hostname,
|
|
|
|
len, share,
|
|
|
|
share + len + 1 /* "dir1/dir2" */
|
|
|
|
);
|
2013-01-22 15:30:45 +05:30
|
|
|
parse_mount_options(unc, &filteropts);
|
|
|
|
if (ENABLE_FEATURE_CLEAN_UP) free(unc);
|
2013-01-16 05:17:19 +05:30
|
|
|
}
|
|
|
|
|
2009-12-15 21:06:14 +05:30
|
|
|
lsa = host2sockaddr(hostname, 0);
|
2013-01-17 07:00:35 +05:30
|
|
|
share[-1] = c;
|
2009-04-12 17:46:21 +05:30
|
|
|
if (!lsa)
|
|
|
|
goto report_error;
|
2006-09-15 20:42:00 +05:30
|
|
|
|
2016-09-28 00:32:35 +05:30
|
|
|
// If there is no "ip=..." option yet
|
|
|
|
if (!is_prefixed_with(filteropts, ",ip="+1)
|
|
|
|
&& !strstr(filteropts, ",ip=")
|
|
|
|
) {
|
|
|
|
char *dotted, *ip;
|
|
|
|
// Insert "ip=..." option into options
|
|
|
|
dotted = xmalloc_sockaddr2dotted_noport(&lsa->u.sa);
|
|
|
|
if (ENABLE_FEATURE_CLEAN_UP) free(lsa);
|
|
|
|
ip = xasprintf("ip=%s", dotted);
|
|
|
|
if (ENABLE_FEATURE_CLEAN_UP) free(dotted);
|
2016-09-27 00:06:30 +05:30
|
|
|
// Note: IPv6 scoped addresses ("host%iface", see RFC 4007) should be
|
2016-09-26 23:23:04 +05:30
|
|
|
// handled by libc in getnameinfo() (inside xmalloc_sockaddr2dotted_noport()).
|
|
|
|
// Currently, glibc does not support that (has no NI_NUMERICSCOPE),
|
|
|
|
// musl apparently does. This results in "ip=numericIPv6%iface_name"
|
|
|
|
// (instead of _numeric_ iface_id) with glibc.
|
2016-09-27 00:06:30 +05:30
|
|
|
// This probably should be fixed in glibc, not here.
|
2016-09-28 00:32:35 +05:30
|
|
|
// The workaround is to manually specify correct "ip=ADDR%n" option.
|
|
|
|
parse_mount_options(ip, &filteropts);
|
|
|
|
if (ENABLE_FEATURE_CLEAN_UP) free(ip);
|
|
|
|
}
|
2006-09-15 20:42:00 +05:30
|
|
|
|
2007-01-30 04:21:44 +05:30
|
|
|
mp->mnt_type = (char*)"cifs";
|
2006-09-15 20:42:00 +05:30
|
|
|
rc = mount_it_now(mp, vfsflags, filteropts);
|
2009-12-15 05:58:59 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
goto report_error;
|
2006-09-14 21:16:33 +05:30
|
|
|
}
|
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
// Might this be an NFS filesystem?
|
2015-03-12 22:18:34 +05:30
|
|
|
if ((!mp->mnt_type || is_prefixed_with(mp->mnt_type, "nfs"))
|
2007-01-22 19:36:03 +05:30
|
|
|
&& strchr(mp->mnt_fsname, ':') != NULL
|
|
|
|
) {
|
2011-11-10 21:23:35 +05:30
|
|
|
if (!mp->mnt_type)
|
|
|
|
mp->mnt_type = (char*)"nfs";
|
2006-09-15 20:42:00 +05:30
|
|
|
rc = nfsmount(mp, vfsflags, filteropts);
|
|
|
|
goto report_error;
|
|
|
|
}
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
// Look at the file. (Not found isn't a failure for remount, or for
|
|
|
|
// a synthetic filesystem like proc or sysfs.)
|
2007-05-20 18:02:41 +05:30
|
|
|
// (We use stat, not lstat, in order to allow
|
|
|
|
// mount symlink_to_file_or_blkdev dir)
|
|
|
|
if (!stat(mp->mnt_fsname, &st)
|
2007-01-22 19:36:03 +05:30
|
|
|
&& !(vfsflags & (MS_REMOUNT | MS_BIND | MS_MOVE))
|
|
|
|
) {
|
2006-09-15 20:42:00 +05:30
|
|
|
// Do we need to allocate a loopback device for it?
|
|
|
|
if (ENABLE_FEATURE_MOUNT_LOOP && S_ISREG(st.st_mode)) {
|
2020-07-29 14:13:53 +05:30
|
|
|
unsigned long long offset;
|
|
|
|
unsigned long long sizelimit;
|
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
loopFile = bb_simplify_path(mp->mnt_fsname);
|
2008-12-05 22:10:36 +05:30
|
|
|
mp->mnt_fsname = NULL; // will receive malloced loop dev name
|
2017-03-16 21:19:37 +05:30
|
|
|
|
2020-07-29 14:13:53 +05:30
|
|
|
// Parse and remove loopback options
|
|
|
|
offset = cut_out_ull_opt(filteropts, "offset=");
|
|
|
|
sizelimit = cut_out_ull_opt(filteropts, "sizelimit=");
|
|
|
|
|
2017-03-16 21:19:37 +05:30
|
|
|
// mount always creates AUTOCLEARed loopdevs, so that umounting
|
|
|
|
// drops them without any code in the userspace.
|
|
|
|
// This happens since circa linux-2.6.25:
|
|
|
|
// commit 96c5865559cee0f9cbc5173f3c949f6ce3525581
|
|
|
|
// Date: Wed Feb 6 01:36:27 2008 -0800
|
|
|
|
// Subject: Allow auto-destruction of loop devices
|
|
|
|
loopfd = set_loop(&mp->mnt_fsname,
|
|
|
|
loopFile,
|
2020-07-29 14:13:53 +05:30
|
|
|
offset,
|
|
|
|
sizelimit,
|
2017-03-16 21:19:37 +05:30
|
|
|
((vfsflags & MS_RDONLY) ? BB_LO_FLAGS_READ_ONLY : 0)
|
|
|
|
| BB_LO_FLAGS_AUTOCLEAR
|
|
|
|
);
|
|
|
|
if (loopfd < 0) {
|
2007-08-03 19:46:24 +05:30
|
|
|
if (errno == EPERM || errno == EACCES)
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg(bb_msg_perm_denied_are_you_root);
|
2007-08-03 19:46:24 +05:30
|
|
|
else
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_perror_msg("can't setup loop device");
|
2006-09-17 20:34:35 +05:30
|
|
|
return errno;
|
2006-09-14 21:16:33 +05:30
|
|
|
}
|
2006-09-15 20:42:00 +05:30
|
|
|
|
|
|
|
// Autodetect bind mounts
|
|
|
|
} else if (S_ISDIR(st.st_mode) && !mp->mnt_type)
|
|
|
|
vfsflags |= MS_BIND;
|
|
|
|
}
|
|
|
|
|
2008-12-05 22:10:36 +05:30
|
|
|
// If we know the fstype (or don't need to), jump straight
|
|
|
|
// to the actual mount.
|
2010-06-27 20:17:40 +05:30
|
|
|
if (mp->mnt_type || (vfsflags & (MS_REMOUNT | MS_BIND | MS_MOVE))) {
|
2011-11-03 14:32:31 +05:30
|
|
|
char *next;
|
|
|
|
for (;;) {
|
|
|
|
next = mp->mnt_type ? strchr(mp->mnt_type, ',') : NULL;
|
|
|
|
if (next)
|
|
|
|
*next = '\0';
|
|
|
|
rc = mount_it_now(mp, vfsflags, filteropts);
|
|
|
|
if (rc == 0 || !next)
|
|
|
|
break;
|
|
|
|
mp->mnt_type = next + 1;
|
|
|
|
}
|
2010-06-27 20:17:40 +05:30
|
|
|
} else {
|
2007-01-22 19:36:03 +05:30
|
|
|
// Loop through filesystem types until mount succeeds
|
|
|
|
// or we run out
|
2006-09-15 20:42:00 +05:30
|
|
|
|
2009-12-15 21:06:14 +05:30
|
|
|
// Initialize list of block backed filesystems.
|
|
|
|
// This has to be done here so that during "mount -a",
|
|
|
|
// mounts after /proc shows up can autodetect.
|
2006-09-15 20:42:00 +05:30
|
|
|
if (!fslist) {
|
|
|
|
fslist = get_block_backed_filesystems();
|
|
|
|
if (ENABLE_FEATURE_CLEAN_UP && fslist)
|
|
|
|
atexit(delete_block_backed_filesystems);
|
2006-09-14 21:16:33 +05:30
|
|
|
}
|
2006-09-15 20:42:00 +05:30
|
|
|
|
|
|
|
for (fl = fslist; fl; fl = fl->link) {
|
|
|
|
mp->mnt_type = fl->data;
|
2006-09-17 20:34:35 +05:30
|
|
|
rc = mount_it_now(mp, vfsflags, filteropts);
|
2011-11-03 14:32:31 +05:30
|
|
|
if (rc == 0)
|
2009-06-19 15:18:29 +05:30
|
|
|
break;
|
2006-09-14 21:16:33 +05:30
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
// If mount failed, clean up loop file (if any).
|
2017-03-16 21:19:37 +05:30
|
|
|
// (Newer kernels which support LO_FLAGS_AUTOCLEAR should not need this,
|
|
|
|
// merely "close(loopfd)" should do it?)
|
2006-09-15 20:42:00 +05:30
|
|
|
if (ENABLE_FEATURE_MOUNT_LOOP && rc && loopFile) {
|
|
|
|
del_loop(mp->mnt_fsname);
|
|
|
|
if (ENABLE_FEATURE_CLEAN_UP) {
|
|
|
|
free(loopFile);
|
2016-06-20 14:34:04 +05:30
|
|
|
/* No, "rc != 0" needs it: free(mp->mnt_fsname); */
|
2006-09-15 20:42:00 +05:30
|
|
|
}
|
2006-09-14 21:16:33 +05:30
|
|
|
}
|
|
|
|
|
2007-02-04 08:09:55 +05:30
|
|
|
report_error:
|
|
|
|
if (ENABLE_FEATURE_CLEAN_UP)
|
|
|
|
free(filteropts);
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2017-03-16 21:19:37 +05:30
|
|
|
if (loopfd >= 0)
|
|
|
|
close(loopfd);
|
|
|
|
|
2007-09-08 01:03:56 +05:30
|
|
|
if (errno == EBUSY && ignore_busy)
|
|
|
|
return 0;
|
2015-12-31 00:41:34 +05:30
|
|
|
if (errno == ENOENT && (vfsflags & MOUNT_NOFAIL))
|
|
|
|
return 0;
|
2010-06-27 20:17:40 +05:30
|
|
|
if (rc != 0)
|
2007-08-03 19:46:24 +05:30
|
|
|
bb_perror_msg("mounting %s on %s failed", mp->mnt_fsname, mp->mnt_dir);
|
2006-09-15 20:42:00 +05:30
|
|
|
return rc;
|
|
|
|
}
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2009-12-04 08:03:07 +05:30
|
|
|
// -O support
|
|
|
|
// -O interprets a list of filter options which select whether a mount
|
|
|
|
// point will be mounted: only mounts with options matching *all* filtering
|
|
|
|
// options will be selected.
|
|
|
|
// By default each -O filter option must be present in the list of mount
|
|
|
|
// options, but if it is prefixed by "no" then it must be absent.
|
|
|
|
// For example,
|
|
|
|
// -O a,nob,c matches -o a,c but fails to match -o a,b,c
|
|
|
|
// (and also fails to match -o a because -o c is absent).
|
|
|
|
//
|
|
|
|
// It is different from -t in that each option is matched exactly; a leading
|
|
|
|
// "no" at the beginning of one option does not negate the rest.
|
|
|
|
static int match_opt(const char *fs_opt_in, const char *O_opt)
|
2009-03-15 04:27:20 +05:30
|
|
|
{
|
|
|
|
if (!O_opt)
|
2009-12-04 08:03:07 +05:30
|
|
|
return 1;
|
|
|
|
|
|
|
|
while (*O_opt) {
|
|
|
|
const char *fs_opt = fs_opt_in;
|
|
|
|
int O_len;
|
|
|
|
int match;
|
|
|
|
|
|
|
|
// If option begins with "no" then treat as an inverted match:
|
|
|
|
// matching is a failure
|
|
|
|
match = 0;
|
|
|
|
if (O_opt[0] == 'n' && O_opt[1] == 'o') {
|
|
|
|
match = 1;
|
|
|
|
O_opt += 2;
|
2009-03-15 04:27:20 +05:30
|
|
|
}
|
2009-12-04 08:03:07 +05:30
|
|
|
// Isolate the current O option
|
|
|
|
O_len = strchrnul(O_opt, ',') - O_opt;
|
|
|
|
// Check for a match against existing options
|
|
|
|
while (1) {
|
|
|
|
if (strncmp(fs_opt, O_opt, O_len) == 0
|
|
|
|
&& (fs_opt[O_len] == '\0' || fs_opt[O_len] == ',')
|
|
|
|
) {
|
|
|
|
if (match)
|
|
|
|
return 0; // "no" prefix, but option found
|
|
|
|
match = 1; // current O option found, go check next one
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
fs_opt = strchr(fs_opt, ',');
|
|
|
|
if (!fs_opt)
|
|
|
|
break;
|
|
|
|
fs_opt++;
|
|
|
|
}
|
|
|
|
if (match == 0)
|
|
|
|
return 0; // match wanted but not found
|
|
|
|
if (O_opt[O_len] == '\0') // end?
|
2009-03-15 04:27:20 +05:30
|
|
|
break;
|
2009-12-04 08:03:07 +05:30
|
|
|
// Step to the next O option
|
|
|
|
O_opt += O_len + 1;
|
2009-03-15 04:27:20 +05:30
|
|
|
}
|
2009-12-04 08:03:07 +05:30
|
|
|
// If we get here then everything matched
|
|
|
|
return 1;
|
2009-03-15 04:27:20 +05:30
|
|
|
}
|
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
// Parse options, if necessary parse fstab/mtab, and call singlemount for
|
|
|
|
// each directory to be mounted.
|
2007-10-11 15:35:36 +05:30
|
|
|
int mount_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
2008-07-05 14:48:54 +05:30
|
|
|
int mount_main(int argc UNUSED_PARAM, char **argv)
|
2006-09-15 20:42:00 +05:30
|
|
|
{
|
2009-03-15 04:27:20 +05:30
|
|
|
char *cmdopts = xzalloc(1);
|
2008-03-17 14:16:43 +05:30
|
|
|
char *fstype = NULL;
|
2009-03-15 04:27:20 +05:30
|
|
|
char *O_optmatch = NULL;
|
2008-06-25 00:29:59 +05:30
|
|
|
char *storage_path;
|
2008-10-19 00:45:57 +05:30
|
|
|
llist_t *lst_o = NULL;
|
2015-03-11 20:37:24 +05:30
|
|
|
const char *fstabname = "/etc/fstab";
|
2006-09-15 20:42:00 +05:30
|
|
|
FILE *fstab;
|
2009-12-05 08:55:19 +05:30
|
|
|
int i, j;
|
|
|
|
int rc = EXIT_SUCCESS;
|
2012-06-21 15:38:56 +05:30
|
|
|
unsigned long cmdopt_flags;
|
2006-10-04 02:30:06 +05:30
|
|
|
unsigned opt;
|
2006-09-15 20:42:00 +05:30
|
|
|
struct mntent mtpair[2], *mtcur = mtpair;
|
2009-04-21 16:39:40 +05:30
|
|
|
IF_NOT_DESKTOP(const int nonroot = 0;)
|
2006-09-15 20:42:00 +05:30
|
|
|
|
2009-04-21 16:39:40 +05:30
|
|
|
IF_DESKTOP(int nonroot = ) sanitize_env_if_suid();
|
2008-02-18 16:38:33 +05:30
|
|
|
|
2011-09-21 05:29:15 +05:30
|
|
|
INIT_G();
|
|
|
|
|
2008-02-18 17:37:49 +05:30
|
|
|
// Parse long options, like --bind and --move. Note that -o option
|
|
|
|
// and --option are synonymous. Yes, this means --remount,rw works.
|
2008-06-25 00:29:59 +05:30
|
|
|
for (i = j = 1; argv[i]; i++) {
|
|
|
|
if (argv[i][0] == '-' && argv[i][1] == '-')
|
|
|
|
append_mount_options(&cmdopts, argv[i] + 2);
|
|
|
|
else
|
|
|
|
argv[j++] = argv[i];
|
2006-09-15 20:42:00 +05:30
|
|
|
}
|
2008-03-17 14:16:43 +05:30
|
|
|
argv[j] = NULL;
|
2006-09-15 20:42:00 +05:30
|
|
|
|
|
|
|
// Parse remaining options
|
2009-03-15 04:27:20 +05:30
|
|
|
// Max 2 params; -o is a list, -v is a counter
|
2017-08-09 01:25:02 +05:30
|
|
|
opt = getopt32(argv, "^"
|
|
|
|
OPTION_STR
|
|
|
|
"\0" "?2"IF_FEATURE_MOUNT_VERBOSE("vv"),
|
|
|
|
&lst_o, &fstype, &O_optmatch
|
|
|
|
IF_FEATURE_MOUNT_OTHERTAB(, &fstabname)
|
|
|
|
IF_FEATURE_MOUNT_VERBOSE(, &verbose)
|
|
|
|
);
|
|
|
|
|
2008-10-19 00:45:57 +05:30
|
|
|
while (lst_o) append_mount_options(&cmdopts, llist_pop(&lst_o)); // -o
|
2008-02-17 04:58:42 +05:30
|
|
|
if (opt & OPT_r) append_mount_options(&cmdopts, "ro"); // -r
|
|
|
|
if (opt & OPT_w) append_mount_options(&cmdopts, "rw"); // -w
|
2006-09-17 20:34:01 +05:30
|
|
|
argv += optind;
|
2006-09-15 20:42:00 +05:30
|
|
|
|
|
|
|
// If we have no arguments, show currently mounted filesystems
|
2008-06-25 00:29:59 +05:30
|
|
|
if (!argv[0]) {
|
2008-03-17 14:25:44 +05:30
|
|
|
if (!(opt & OPT_a)) {
|
2006-09-15 20:42:00 +05:30
|
|
|
FILE *mountTable = setmntent(bb_path_mtab_file, "r");
|
|
|
|
|
2008-06-25 00:29:59 +05:30
|
|
|
if (!mountTable)
|
|
|
|
bb_error_msg_and_die("no %s", bb_path_mtab_file);
|
2006-09-15 20:42:00 +05:30
|
|
|
|
2007-09-15 18:58:30 +05:30
|
|
|
while (getmntent_r(mountTable, &mtpair[0], getmntent_buf,
|
2008-03-17 15:03:45 +05:30
|
|
|
GETMNTENT_BUFSIZE))
|
2006-09-15 20:42:00 +05:30
|
|
|
{
|
2006-10-17 04:09:51 +05:30
|
|
|
// Don't show rootfs. FIXME: why??
|
2006-12-19 04:37:42 +05:30
|
|
|
// util-linux 2.12a happily shows rootfs...
|
2009-12-15 05:58:59 +05:30
|
|
|
//if (strcmp(mtpair->mnt_fsname, "rootfs") == 0) continue;
|
2006-09-15 20:42:00 +05:30
|
|
|
|
2009-12-15 05:58:59 +05:30
|
|
|
if (!fstype || strcmp(mtpair->mnt_type, fstype) == 0)
|
2006-09-15 20:42:00 +05:30
|
|
|
printf("%s on %s type %s (%s)\n", mtpair->mnt_fsname,
|
|
|
|
mtpair->mnt_dir, mtpair->mnt_type,
|
|
|
|
mtpair->mnt_opts);
|
2006-09-14 21:16:33 +05:30
|
|
|
}
|
2008-06-25 00:29:59 +05:30
|
|
|
if (ENABLE_FEATURE_CLEAN_UP)
|
|
|
|
endmntent(mountTable);
|
2006-09-15 20:42:00 +05:30
|
|
|
return EXIT_SUCCESS;
|
2006-09-14 21:16:33 +05:30
|
|
|
}
|
2008-06-25 00:29:59 +05:30
|
|
|
storage_path = NULL;
|
|
|
|
} else {
|
|
|
|
// When we have two arguments, the second is the directory and we can
|
|
|
|
// skip looking at fstab entirely. We can always abspath() the directory
|
|
|
|
// argument when we get it.
|
|
|
|
if (argv[1]) {
|
|
|
|
if (nonroot)
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg_and_die(bb_msg_you_must_be_root);
|
2008-06-25 00:29:59 +05:30
|
|
|
mtpair->mnt_fsname = argv[0];
|
|
|
|
mtpair->mnt_dir = argv[1];
|
|
|
|
mtpair->mnt_type = fstype;
|
|
|
|
mtpair->mnt_opts = cmdopts;
|
2008-12-10 17:09:18 +05:30
|
|
|
resolve_mount_spec(&mtpair->mnt_fsname);
|
2009-12-05 08:55:19 +05:30
|
|
|
rc = singlemount(mtpair, /*ignore_busy:*/ 0);
|
2008-06-25 00:29:59 +05:30
|
|
|
return rc;
|
2008-02-19 02:38:49 +05:30
|
|
|
}
|
2008-06-25 00:29:59 +05:30
|
|
|
storage_path = bb_simplify_path(argv[0]); // malloced
|
2006-09-14 21:16:33 +05:30
|
|
|
}
|
|
|
|
|
2008-06-25 00:29:59 +05:30
|
|
|
// Past this point, we are handling either "mount -a [opts]"
|
|
|
|
// or "mount [opts] single_param"
|
|
|
|
|
2012-06-21 15:38:56 +05:30
|
|
|
cmdopt_flags = parse_mount_options(cmdopts, NULL);
|
|
|
|
if (nonroot && (cmdopt_flags & ~MS_SILENT)) // Non-root users cannot specify flags
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg_and_die(bb_msg_you_must_be_root);
|
2006-10-03 00:22:49 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
// If we have a shared subtree flag, don't worry about fstab or mtab.
|
2007-01-22 19:36:03 +05:30
|
|
|
if (ENABLE_FEATURE_MOUNT_FLAGS
|
2012-06-21 15:38:56 +05:30
|
|
|
&& (cmdopt_flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))
|
2007-01-22 19:36:03 +05:30
|
|
|
) {
|
2008-12-05 22:10:36 +05:30
|
|
|
// verbose_mount(source, target, type, flags, data)
|
2012-06-21 15:38:56 +05:30
|
|
|
rc = verbose_mount("", argv[0], "", cmdopt_flags, "");
|
2008-06-25 00:29:59 +05:30
|
|
|
if (rc)
|
|
|
|
bb_simple_perror_msg_and_die(argv[0]);
|
|
|
|
return rc;
|
2006-09-15 20:42:00 +05:30
|
|
|
}
|
2006-09-17 21:58:10 +05:30
|
|
|
|
2015-03-11 20:37:24 +05:30
|
|
|
// A malicious user could overmount /usr without this.
|
|
|
|
if (ENABLE_FEATURE_MOUNT_OTHERTAB && nonroot)
|
|
|
|
fstabname = "/etc/fstab";
|
2006-09-15 20:42:00 +05:30
|
|
|
// Open either fstab or mtab
|
2012-06-21 15:38:56 +05:30
|
|
|
if (cmdopt_flags & MS_REMOUNT) {
|
2008-06-25 00:29:59 +05:30
|
|
|
// WARNING. I am not sure this matches util-linux's
|
|
|
|
// behavior. It's possible util-linux does not
|
|
|
|
// take -o opts from mtab (takes only mount source).
|
2006-09-15 20:42:00 +05:30
|
|
|
fstabname = bb_path_mtab_file;
|
2006-10-17 04:09:51 +05:30
|
|
|
}
|
|
|
|
fstab = setmntent(fstabname, "r");
|
2006-09-17 20:30:58 +05:30
|
|
|
if (!fstab)
|
2010-03-23 20:55:17 +05:30
|
|
|
bb_perror_msg_and_die("can't read '%s'", fstabname);
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2008-06-25 00:29:59 +05:30
|
|
|
// Loop through entries until we find what we're looking for
|
2006-10-03 00:22:49 +05:30
|
|
|
memset(mtpair, 0, sizeof(mtpair));
|
2006-09-15 20:42:00 +05:30
|
|
|
for (;;) {
|
2008-06-25 00:29:59 +05:30
|
|
|
struct mntent *mtother = (mtcur==mtpair ? mtpair+1 : mtpair);
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
// Get next fstab entry
|
2007-09-15 18:58:30 +05:30
|
|
|
if (!getmntent_r(fstab, mtcur, getmntent_buf
|
2008-03-17 15:03:45 +05:30
|
|
|
+ (mtcur==mtpair ? GETMNTENT_BUFSIZE/2 : 0),
|
2008-06-25 00:29:59 +05:30
|
|
|
GETMNTENT_BUFSIZE/2)
|
|
|
|
) { // End of fstab/mtab is reached
|
|
|
|
mtcur = mtother; // the thing we found last time
|
|
|
|
break;
|
2006-09-14 21:16:33 +05:30
|
|
|
}
|
|
|
|
|
2008-06-25 00:29:59 +05:30
|
|
|
// If we're trying to mount something specific and this isn't it,
|
|
|
|
// skip it. Note we must match the exact text in fstab (ala
|
|
|
|
// "proc") or a full path from root
|
|
|
|
if (argv[0]) {
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2006-09-15 20:42:00 +05:30
|
|
|
// Is this what we're looking for?
|
2009-12-05 08:55:19 +05:30
|
|
|
if (strcmp(argv[0], mtcur->mnt_fsname) != 0
|
|
|
|
&& strcmp(storage_path, mtcur->mnt_fsname) != 0
|
|
|
|
&& strcmp(argv[0], mtcur->mnt_dir) != 0
|
|
|
|
&& strcmp(storage_path, mtcur->mnt_dir) != 0
|
|
|
|
) {
|
|
|
|
continue; // no
|
|
|
|
}
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2008-06-25 00:29:59 +05:30
|
|
|
// Remember this entry. Something later may have
|
|
|
|
// overmounted it, and we want the _last_ match.
|
|
|
|
mtcur = mtother;
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2008-06-25 00:29:59 +05:30
|
|
|
// If we're mounting all
|
2006-09-15 20:42:00 +05:30
|
|
|
} else {
|
2009-12-05 08:55:19 +05:30
|
|
|
struct mntent *mp;
|
2009-03-15 04:27:20 +05:30
|
|
|
// No, mount -a won't mount anything,
|
|
|
|
// even user mounts, for mere humans
|
|
|
|
if (nonroot)
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg_and_die(bb_msg_you_must_be_root);
|
2009-03-15 04:27:20 +05:30
|
|
|
|
|
|
|
// Does type match? (NULL matches always)
|
2017-01-30 05:15:05 +05:30
|
|
|
if (!fstype_matches(mtcur->mnt_type, fstype))
|
2008-03-17 14:16:43 +05:30
|
|
|
continue;
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2009-12-05 08:55:19 +05:30
|
|
|
// Skip noauto and swap anyway
|
2009-03-15 04:27:20 +05:30
|
|
|
if ((parse_mount_options(mtcur->mnt_opts, NULL) & (MOUNT_NOAUTO | MOUNT_SWAP))
|
|
|
|
// swap is bogus "fstype", parse_mount_options can't check fstypes
|
|
|
|
|| strcasecmp(mtcur->mnt_type, "swap") == 0
|
|
|
|
) {
|
2008-03-17 14:16:43 +05:30
|
|
|
continue;
|
2009-03-15 04:27:20 +05:30
|
|
|
}
|
2006-09-15 20:42:00 +05:30
|
|
|
|
2009-03-15 04:27:20 +05:30
|
|
|
// Does (at least one) option match?
|
|
|
|
// (NULL matches always)
|
|
|
|
if (!match_opt(mtcur->mnt_opts, O_optmatch))
|
|
|
|
continue;
|
2006-10-17 04:09:51 +05:30
|
|
|
|
2009-03-15 04:27:20 +05:30
|
|
|
resolve_mount_spec(&mtcur->mnt_fsname);
|
2006-09-15 20:42:00 +05:30
|
|
|
|
2006-12-26 23:47:42 +05:30
|
|
|
// NFS mounts want this to be xrealloc-able
|
|
|
|
mtcur->mnt_opts = xstrdup(mtcur->mnt_opts);
|
2008-12-10 17:09:18 +05:30
|
|
|
|
2009-12-05 08:55:19 +05:30
|
|
|
// If nothing is mounted on this directory...
|
|
|
|
// (otherwise repeated "mount -a" mounts everything again)
|
|
|
|
mp = find_mount_point(mtcur->mnt_dir, /*subdir_too:*/ 0);
|
|
|
|
// We do not check fsname match of found mount point -
|
|
|
|
// "/" may have fsname of "/dev/root" while fstab
|
|
|
|
// says "/dev/something_else".
|
|
|
|
if (mp) {
|
2009-12-11 02:02:28 +05:30
|
|
|
if (verbose) {
|
|
|
|
bb_error_msg("according to %s, "
|
|
|
|
"%s is already mounted on %s",
|
|
|
|
bb_path_mtab_file,
|
|
|
|
mp->mnt_fsname, mp->mnt_dir);
|
|
|
|
}
|
2009-12-05 08:55:19 +05:30
|
|
|
} else {
|
|
|
|
// ...mount this thing
|
|
|
|
if (singlemount(mtcur, /*ignore_busy:*/ 1)) {
|
|
|
|
// Count number of failed mounts
|
|
|
|
rc++;
|
|
|
|
}
|
2006-09-14 21:16:33 +05:30
|
|
|
}
|
2006-12-26 23:47:42 +05:30
|
|
|
free(mtcur->mnt_opts);
|
2006-09-14 21:16:33 +05:30
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-06-25 00:29:59 +05:30
|
|
|
// End of fstab/mtab is reached.
|
|
|
|
// Were we looking for something specific?
|
2009-12-05 08:55:19 +05:30
|
|
|
if (argv[0]) { // yes
|
2012-06-21 15:38:56 +05:30
|
|
|
unsigned long l;
|
2009-03-15 04:27:20 +05:30
|
|
|
|
2008-06-25 00:29:59 +05:30
|
|
|
// If we didn't find anything, complain
|
|
|
|
if (!mtcur->mnt_fsname)
|
|
|
|
bb_error_msg_and_die("can't find %s in %s",
|
|
|
|
argv[0], fstabname);
|
2009-03-15 04:27:20 +05:30
|
|
|
|
|
|
|
// What happens when we try to "mount swap_partition"?
|
|
|
|
// (fstab containts "swap_partition swap swap defaults 0 0")
|
|
|
|
// util-linux-ng 2.13.1 does this:
|
|
|
|
// stat("/sbin/mount.swap", 0x7fff62a3a350) = -1 ENOENT (No such file or directory)
|
|
|
|
// mount("swap_partition", "swap", "swap", MS_MGC_VAL, NULL) = -1 ENOENT (No such file or directory)
|
|
|
|
// lstat("swap", 0x7fff62a3a640) = -1 ENOENT (No such file or directory)
|
|
|
|
// write(2, "mount: mount point swap does not exist\n", 39) = 39
|
|
|
|
// exit_group(32) = ?
|
|
|
|
#if 0
|
|
|
|
// In case we want to simply skip swap partitions:
|
|
|
|
l = parse_mount_options(mtcur->mnt_opts, NULL);
|
|
|
|
if ((l & MOUNT_SWAP)
|
|
|
|
// swap is bogus "fstype", parse_mount_options can't check fstypes
|
|
|
|
|| strcasecmp(mtcur->mnt_type, "swap") == 0
|
|
|
|
) {
|
|
|
|
goto ret;
|
|
|
|
}
|
|
|
|
#endif
|
2008-06-25 00:29:59 +05:30
|
|
|
if (nonroot) {
|
|
|
|
// fstab must have "users" or "user"
|
2009-03-15 04:27:20 +05:30
|
|
|
l = parse_mount_options(mtcur->mnt_opts, NULL);
|
|
|
|
if (!(l & MOUNT_USERS))
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg_and_die(bb_msg_you_must_be_root);
|
2008-06-25 00:29:59 +05:30
|
|
|
}
|
2006-09-14 21:16:33 +05:30
|
|
|
|
2009-12-05 08:55:19 +05:30
|
|
|
//util-linux-2.12 does not do this check.
|
|
|
|
//// If nothing is mounted on this directory...
|
|
|
|
//// (otherwise repeated "mount FOO" mounts FOO again)
|
|
|
|
//mp = find_mount_point(mtcur->mnt_dir, /*subdir_too:*/ 0);
|
|
|
|
//if (mp) {
|
|
|
|
// bb_error_msg("according to %s, "
|
|
|
|
// "%s is already mounted on %s",
|
|
|
|
// bb_path_mtab_file,
|
|
|
|
// mp->mnt_fsname, mp->mnt_dir);
|
|
|
|
//} else {
|
|
|
|
// ...mount the last thing we found
|
|
|
|
mtcur->mnt_opts = xstrdup(mtcur->mnt_opts);
|
|
|
|
append_mount_options(&(mtcur->mnt_opts), cmdopts);
|
|
|
|
resolve_mount_spec(&mtpair->mnt_fsname);
|
|
|
|
rc = singlemount(mtcur, /*ignore_busy:*/ 0);
|
|
|
|
if (ENABLE_FEATURE_CLEAN_UP)
|
|
|
|
free(mtcur->mnt_opts);
|
|
|
|
//}
|
2008-06-25 00:29:59 +05:30
|
|
|
}
|
|
|
|
|
2009-03-15 04:27:20 +05:30
|
|
|
//ret:
|
2008-06-25 00:29:59 +05:30
|
|
|
if (ENABLE_FEATURE_CLEAN_UP)
|
|
|
|
endmntent(fstab);
|
2006-09-15 20:42:00 +05:30
|
|
|
if (ENABLE_FEATURE_CLEAN_UP) {
|
|
|
|
free(storage_path);
|
|
|
|
free(cmdopts);
|
2006-09-14 21:16:33 +05:30
|
|
|
}
|
2009-12-05 08:55:19 +05:30
|
|
|
|
|
|
|
//TODO: exitcode should be ORed mask of (from "man mount"):
|
|
|
|
// 0 success
|
|
|
|
// 1 incorrect invocation or permissions
|
|
|
|
// 2 system error (out of memory, cannot fork, no more loop devices)
|
|
|
|
// 4 internal mount bug or missing nfs support in mount
|
|
|
|
// 8 user interrupt
|
|
|
|
//16 problems writing or locking /etc/mtab
|
|
|
|
//32 mount failure
|
|
|
|
//64 some mount succeeded
|
2006-09-15 20:42:00 +05:30
|
|
|
return rc;
|
2006-09-14 21:16:33 +05:30
|
|
|
}
|