#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <strings.h>
#include <unistd.h>
#include <stdbool.h>
#include <sys/mount.h>
#include <signal.h>
#define ENSC_WRAPPERS_FCNTL 1
+#define ENSC_WRAPPERS_UNISTD 1
#include <wrappers.h>
#define MNTPOINT "/etc"
+typedef enum { rfsYES, rfsNO, rfsONLY } RootFsOption;
+
struct MountInfo {
char const * src;
char const * dst;
char const * type;
unsigned long flag;
unsigned long xflag;
+ unsigned long mask;
char * data;
};
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"
" --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"
if (mnt->flag & MS_BIND) argv[idx++] = "--bind";
else if (mnt->flag & MS_MOVE) argv[idx++] = "--move";
- if (mnt->data &&
+ argv[idx++] = "-o";
+ if (mnt->data && *mnt->data &&
strcmp(mnt->data, "defaults")!=0) {
- argv[idx++] = "-o";
- argv[idx++] = mnt->data;
+ if (mnt->mask & MS_NODEV)
+ argv[idx++] = mnt->data;
+ else {
+ char * tmp = alloca(strlen(mnt->data) + sizeof("nodev,"));
+ strcpy(tmp, "nodev,");
+ strcat(tmp, mnt->data);
+ argv[idx++] = tmp;
+ }
}
+ else
+ argv[idx++] = "nodev";
if (mnt->type) {
argv[idx++] = "-t";
return false;
if (mnt->flag & (MS_BIND|MS_MOVE)) {
+ unsigned long flag = mnt->flag;
+ if ((flag & MS_NODEV)==0) flag |= MS_NODEV;
+
if (mount(mnt->src, ".",
mnt->type ? mnt->type : "",
- mnt->flag, mnt->data)==-1) {
+ flag, mnt->data)==-1) {
perror("secure-mount: mount()");
return false;
}
if (opt!=0) {
info->flag &= ~opt->mask;
info->flag |= opt->flag;
+ info->mask |= opt->mask;
info->xflag |= opt->xflag;
}
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 = MS_NODEV;
+ info->mask = 0;
+ info->xflag = 0;
+
+ if (strcmp(info->type, "swap") ==0) return prIGNORE;
+ else if (strcmp(info->type, "none") ==0) info->type = 0;
+ else if (strcmp(info->type, "devpts")==0) info->mask |= MS_NODEV;
- info->flag = 0;
- info->xflag = 0;
if (col) *col = err_col;
if (!transformOptionList(info,col)) return prFAIL;
if (info->xflag & XFLAG_NOAUTO) return prIGNORE;
buf[len++] = ':';
len += utilvserver_fmt_uint(buf+len, col_nr);
WRITE_STR(fd, fname);
- write(fd, buf, len);
+ Vwrite(fd, buf, len);
}
goto err1;
case prIGNORE : break;
- case prDOIT :
- chdir("/");
- if (!mountSingle(&mnt, opt)) {
+ case prDOIT : {
+ bool is_rootfs = (strcmp(mnt.dst, "/")==0);
+ Echdir("/");
+ 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);
}
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;