#include "util.h"
#include "pathconfig.h"
+#include <lib/internal.h>
+
#include <getopt.h>
#include <fcntl.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <strings.h>
#include <unistd.h>
#include <stdbool.h>
#include <sys/mount.h>
#define MNTPOINT "/etc"
+typedef enum { rfsYES, rfsNO, rfsONLY } RootFsOption;
+
struct MountInfo {
char const * src;
char const * dst;
bool do_chroot;
bool ignore_mtab;
bool mount_all;
+ RootFsOption rootfs;
int cur_dir_fd;
int cur_rootdir_fd;
#define OPTION_CHROOT 1028
#define OPTION_SECURE 1029
#define OPTION_RBIND 1030
+#define OPTION_ROOTFS 1031
#define XFLAG_NOAUTO 0x01
{ "move", no_argument, 0, OPTION_MOVE },
{ "mtab", required_argument, 0, OPTION_MTAB },
{ "fstab", required_argument, 0, OPTION_FSTAB },
+ { "rootfs", required_argument, 0, OPTION_ROOTFS },
{ "chroot", no_argument, 0, OPTION_CHROOT },
{ "secure", no_argument, 0, OPTION_SECURE },
{ "rbind", no_argument, 0, OPTION_RBIND },
WRITE_MSG(fd, "Usage: ");
WRITE_STR(fd, cmd);
WRITE_MSG(fd,
- " [--help] [--version] [--bind] [--move] [--rbind] [-t <type>] [-n]\n"
- " [--mtab <filename>] [--fstab <filename>] [--chroot] \n"
- " -a|([-o <options>] [--] <src> <dst>)\n\n"
+ " [--help] [--version] [--bind] [--move] [--rbind] [-t <type>] [--chroot]\n"
+ " [--mtab <filename>] [--fstab <filename>] [--rootfs yes|no|only]\n"
+ " [-n] -a|([-o <options>] [--] <src> <dst>)\n\n"
"Executes mount-operations under the current directory: it assumes sources in\n"
"the current root-dir while destinations are expected in the chroot environment.\n\n"
"For non-trivial mount-operations it uses the external 'mount' program which\n"
"can be overridden by the $MOUNT environment variable.\n\n"
+ "Options:\n"
+ " --bind|move|rbind ... set the correspond flags; with this options\n"
+ " the mount will be executed internally without\n"
+ " calling an external mount program.\n"
+ " -t <type> ... assume the given filesystem type\n"
+ " -o <options> ... set additional options; see mount(2) for details\n"
+ " -n ... do not update the mtab-file\n"
+ " --mtab <filename> ... use <filename> as an alternative mtab file\n"
+ " [default: /etc/mtab]\n"
+ " --chroot ... chroot into the current directory before\n"
+ " mounting the filesystem\n"
+ " --fstab <filename> ... use <filename> as an alternative fstab file;\n"
+ " this option has an effect only with the '-a'\n"
+ " option [default: /etc/fstab]\n"
+ " --rootfs yes|no|only ... specifies how to handle an entry for a rootfs\n"
+ " ('/') when processing an fstab file. 'yes' will\n"
+ " mount it among the other entries, 'only' will\n"
+ " mount only the rootfs entry, and 'no' will ignore\n"
+ " it and mount only the other entries [default: yes]\n"
+ " -a ... mount everything listed in the fstab-file\n\n"
+ " <src> ... the source-filesystem; this path is absolute\n"
+ " to the current root-filesystem. Only valid\n"
+ " without the '-a' option.\n"
+ " <dst> ... the destination mount-point; when used with\n"
+ " '--chroot', this path is relative to the current\n"
+ " directory. Only valid without the '-a' option\n\n"
"Please report bugs to " PACKAGE_BUGREPORT "\n");
exit(res);
}
static bool
-transformOptionList(struct MountInfo *info)
+transformOptionList(struct MountInfo *info, size_t UNUSED *col)
{
char const * ptr = info->data;
#define MOVE_TO_NEXT_FIELD(PTR,ALLOW_EOL) \
while (!isspace(*PTR) && *PTR!='\0') ++PTR; \
+ if (col) *col = buf-start_buf+1; \
if (!(ALLOW_EOL) && *PTR=='\0') return prFAIL; \
*PTR++ = '\0'; \
while (isspace(*PTR)) ++PTR
static enum {prDOIT, prFAIL, prIGNORE}
-parseFstabLine(struct MountInfo *info, char *buf)
+ parseFstabLine(struct MountInfo *info, char *buf, size_t *col)
{
+ char const * const start_buf = buf;
+ size_t err_col;
+
while (isspace(*buf)) ++buf;
if (*buf=='#' || *buf=='\0') return prIGNORE;
MOVE_TO_NEXT_FIELD(buf, false);
info->type = buf;
MOVE_TO_NEXT_FIELD(buf, false);
+ err_col = buf-start_buf+1;
info->data = buf;
MOVE_TO_NEXT_FIELD(buf, true);
if (strcmp(info->type, "swap")==0) return prIGNORE;
if (strcmp(info->type, "none")==0) info->type = 0;
- info->flag = 0;
- info->xflag = 0;
- if (!transformOptionList(info)) return prFAIL;
- if (info->xflag & XFLAG_NOAUTO) return prIGNORE;
+ info->flag = 0;
+ info->xflag = 0;
+ if (col) *col = err_col;
+ if (!transformOptionList(info,col)) return prFAIL;
+ if (info->xflag & XFLAG_NOAUTO) return prIGNORE;
return prDOIT;
}
#undef MOVE_TO_NEXT_FIELD
+static void
+showFstabPosition(int fd, char const *fname, size_t line_nr, size_t col_nr)
+{
+ char buf[3*sizeof(line_nr)*2 + 4];
+ size_t len = utilvserver_fmt_uint(buf+1, line_nr)+1;
+
+ buf[0] = ':';
+ buf[len++] = ':';
+ len += utilvserver_fmt_uint(buf+len, col_nr);
+ WRITE_STR(fd, fname);
+ write(fd, buf, len);
+}
+
+
static bool
mountFstab(struct Options const *opt)
{
goto err0;
}
- len = lseek(fd, 0, SEEK_END);
+ len = lseek(fd, 0, SEEK_END);
if (len==-1 ||
lseek(fd, 0, SEEK_SET)==-1) {
perror("secure-mount: lseek(<fstab>)");
{
char buf[len+2];
char *ptr, *ptrptr;
+ size_t line_nr=0, col_nr;
if (read(fd, buf, len+1)!=len) {
perror("secure-mount: read()");
buf[len] = '#'; // workaround for broken dietlibc strtok_r()
// implementation
buf[len+1] = '\0';
+ ptrptr = buf;
- ptr = strtok_r(buf, "\n", &ptrptr);
- while (ptr) {
+ while ((ptr=strsep(&ptrptr, "\n")) != 0) {
struct MountInfo mnt;
- char * new_ptr = strtok_r(0, "\n", &ptrptr);
+ ++line_nr;
- switch (parseFstabLine(&mnt, ptr)) {
+ switch (parseFstabLine(&mnt, ptr, &col_nr)) {
case prFAIL :
- WRITE_MSG(2, "Failed to parse fstab-line beginning with '");
- WRITE_STR(2, ptr);
- WRITE_MSG(2, "'\n");
+ showFstabPosition(2, opt->fstab, line_nr, col_nr);
+ WRITE_MSG(2, ": syntax error\n");
goto err1;
case prIGNORE : break;
- case prDOIT :
+ case prDOIT : {
+ bool is_rootfs = (strcmp(mnt.dst, "/")==0);
chdir("/");
- if (!mountSingle(&mnt, opt)) {
- WRITE_MSG(2, "Failed to mount fstab-line beginning with '");
- WRITE_STR(2, ptr);
- WRITE_MSG(2, "'\n");
+ if (( is_rootfs && opt->rootfs==rfsNO) ||
+ (!is_rootfs && opt->rootfs==rfsONLY)) { /* ignore the entry */ }
+ else if (!mountSingle(&mnt, opt)) {
+ showFstabPosition(2, opt->fstab, line_nr, 1);
+ WRITE_MSG(2, ": failed to mount fstab-entry\n");
}
break;
+ }
default :
assert(false);
}
-
- ptr = new_ptr;
}
}
Efcntl(opt->cur_rootdir_fd, F_SETFD, FD_CLOEXEC);
}
+static RootFsOption
+parseRootFS(char const *str)
+{
+ if (strcasecmp(str, "yes")==0) return rfsYES;
+ else if (strcasecmp(str, "no")==0) return rfsNO;
+ else if (strcasecmp(str, "only")==0) return rfsONLY;
+ else {
+ WRITE_MSG(2, "secure-mount: invalid option for '--rootfs': '");
+ WRITE_STR(2, str);
+ WRITE_MSG(2, "'\n");
+ exit(wrapper_exit_code);
+ }
+}
+
int main(int argc, char *argv[])
{
struct MountInfo mnt = {
.ignore_mtab = false,
.mount_all = false,
.cur_dir_fd = -1,
- .cur_rootdir_fd = -1
+ .cur_rootdir_fd = -1,
+ .rootfs = rfsYES
};
while (1) {
case OPTION_MTAB : opt.mtab = optarg; break;
case OPTION_FSTAB : opt.fstab = optarg; break;
case OPTION_CHROOT: opt.do_chroot = true; break;
+ case OPTION_ROOTFS: opt.rootfs = parseRootFS(optarg); break;
case OPTION_SECURE:
WRITE_MSG(2, "secure-mount: The '--secure' option is deprecated...\n");
break;
if (mnt.data) {
mnt.data = strdup(mnt.data);
- if (!transformOptionList(&mnt)) {
+ if (!transformOptionList(&mnt, 0)) {
WRITE_MSG(2, "Invalid options specified\n");
return EXIT_FAILURE;
}