#include "fileio.h"
#include "generator.h"
#include "strv.h"
+#include "virt.h"
static const char *arg_dest = "/tmp";
static bool arg_fstab_enabled = true;
+static char *arg_root_what = NULL;
+static char *arg_root_fstype = NULL;
+static char *arg_root_options = NULL;
+static int arg_root_rw = -1;
+static char *arg_usr_what = NULL;
+static char *arg_usr_fstype = NULL;
+static char *arg_usr_options = NULL;
static int mount_find_pri(struct mntent *me, int *ret) {
- char *end, *pri;
+ char *end, *opt;
unsigned long r;
assert(me);
assert(ret);
- pri = hasmntopt(me, "pri");
- if (!pri)
+ opt = hasmntopt(me, "pri");
+ if (!opt)
return 0;
- pri += 4;
+ opt += strlen("pri");
+ if (*opt != '=')
+ return -EINVAL;
errno = 0;
- r = strtoul(pri, &end, 10);
+ r = strtoul(opt + 1, &end, 10);
if (errno > 0)
return -errno;
- if (end == pri || (*end != ',' && *end != 0))
+ if (end == opt + 1 || (*end != ',' && *end != 0))
return -EINVAL;
*ret = (int) r;
return 1;
}
-static int add_swap(const char *what, struct mntent *me) {
+static int add_swap(
+ const char *what,
+ struct mntent *me,
+ bool noauto,
+ bool nofail) {
+
_cleanup_free_ char *name = NULL, *unit = NULL, *lnk = NULL;
_cleanup_fclose_ FILE *f = NULL;
- bool noauto;
int r, pri = -1;
assert(what);
assert(me);
+ if (access("/proc/swaps", F_OK) < 0) {
+ log_info("Swap not supported, ignoring fstab swap entry for %s.", what);
+ return 0;
+ }
+
+ if (detect_container(NULL) > 0) {
+ log_info("Running in a container, ignoring fstab swap entry for %s.", what);
+ return 0;
+ }
+
r = mount_find_pri(me, &pri);
if (r < 0) {
log_error("Failed to parse priority");
- return pri;
+ return r;
}
- noauto = !!hasmntopt(me, "noauto");
-
name = unit_name_from_path(what, ".swap");
if (!name)
return log_oom();
if (errno == EEXIST)
log_error("Failed to create swap unit file %s, as it already exists. Duplicate entry in /etc/fstab?", unit);
else
- log_error("Failed to create unit file %s: %m", unit);
+ log_error_errno(errno, "Failed to create unit file %s: %m", unit);
return -errno;
}
"What=%s\n",
what);
+ /* Note that we currently pass the priority field twice, once
+ * in Priority=, and once in Options= */
if (pri >= 0)
- fprintf(f,
- "Priority=%i\n",
- pri);
+ fprintf(f, "Priority=%i\n", pri);
- fflush(f);
- if (ferror(f)) {
- log_error("Failed to write unit file %s: %m", unit);
- return -errno;
- }
+ if (!isempty(me->mnt_opts) && !streq(me->mnt_opts, "defaults"))
+ fprintf(f, "Options=%s\n", me->mnt_opts);
+
+ r = fflush_and_check(f);
+ if (r < 0)
+ return log_error_errno(r, "Failed to write unit file %s: %m", unit);
+
+ /* use what as where, to have a nicer error message */
+ r = generator_write_timeouts(arg_dest, what, what, me->mnt_opts, NULL);
+ if (r < 0)
+ return r;
if (!noauto) {
- lnk = strjoin(arg_dest, "/" SPECIAL_SWAP_TARGET ".wants/", name, NULL);
+ lnk = strjoin(arg_dest, "/" SPECIAL_SWAP_TARGET,
+ nofail ? ".wants/" : ".requires/", name, NULL);
if (!lnk)
return log_oom();
mkdir_parents_label(lnk, 0755);
- if (symlink(unit, lnk) < 0) {
- log_error("Failed to create symlink %s: %m", lnk);
- return -errno;
- }
+ if (symlink(unit, lnk) < 0)
+ return log_error_errno(errno, "Failed to create symlink %s: %m", lnk);
}
return 0;
static int add_mount(
const char *what,
const char *where,
- const char *type,
+ const char *fstype,
const char *opts,
int passno,
bool noauto,
_cleanup_free_ char
*name = NULL, *unit = NULL, *lnk = NULL,
- *automount_name = NULL, *automount_unit = NULL;
+ *automount_name = NULL, *automount_unit = NULL,
+ *filtered = NULL;
_cleanup_fclose_ FILE *f = NULL;
int r;
assert(what);
assert(where);
- assert(type);
assert(opts);
assert(source);
- if (streq(type, "autofs"))
+ if (streq_ptr(fstype, "autofs"))
return 0;
if (!is_path(where)) {
return 0;
if (path_equal(where, "/")) {
+ /* The root disk is not an option */
automount = false;
noauto = false;
nofail = false;
if (errno == EEXIST)
log_error("Failed to create mount unit file %s, as it already exists. Duplicate entry in /etc/fstab?", unit);
else
- log_error("Failed to create unit file %s: %m", unit);
+ log_error_errno(errno, "Failed to create unit file %s: %m", unit);
return -errno;
}
source);
if (post && !noauto && !nofail && !automount)
- fprintf(f,
- "Before=%s\n",
- post);
+ fprintf(f, "Before=%s\n", post);
if (passno != 0) {
- r = generator_write_fsck_deps(f, arg_dest, what, where, type);
+ r = generator_write_fsck_deps(f, arg_dest, what, where, fstype);
if (r < 0)
return r;
}
"\n"
"[Mount]\n"
"What=%s\n"
- "Where=%s\n"
- "Type=%s\n",
+ "Where=%s\n",
what,
- where,
- type);
+ where);
- if (!isempty(opts) && !streq(opts, "defaults"))
- fprintf(f,
- "Options=%s\n",
- opts);
+ if (!isempty(fstype) && !streq(fstype, "auto"))
+ fprintf(f, "Type=%s\n", fstype);
+
+ r = generator_write_timeouts(arg_dest, what, where, opts, &filtered);
+ if (r < 0)
+ return r;
+
+ if (!isempty(filtered) && !streq(filtered, "defaults"))
+ fprintf(f, "Options=%s\n", filtered);
fflush(f);
- if (ferror(f)) {
- log_error("Failed to write unit file %s: %m", unit);
- return -errno;
- }
+ if (ferror(f))
+ return log_error_errno(errno, "Failed to write unit file %s: %m", unit);
- if (!noauto) {
- if (post) {
- lnk = strjoin(arg_dest, "/", post, nofail || automount ? ".wants/" : ".requires/", name, NULL);
- if (!lnk)
- return log_oom();
-
- mkdir_parents_label(lnk, 0755);
- if (symlink(unit, lnk) < 0) {
- log_error("Failed to create symlink %s: %m", lnk);
- return -errno;
- }
- }
+ if (!noauto && post) {
+ lnk = strjoin(arg_dest, "/", post, nofail || automount ? ".wants/" : ".requires/", name, NULL);
+ if (!lnk)
+ return log_oom();
+
+ mkdir_parents_label(lnk, 0755);
+ if (symlink(unit, lnk) < 0)
+ return log_error_errno(errno, "Failed to create symlink %s: %m", lnk);
}
if (automount) {
fclose(f);
f = fopen(automount_unit, "wxe");
- if (!f) {
- log_error("Failed to create unit file %s: %m", automount_unit);
- return -errno;
- }
+ if (!f)
+ return log_error_errno(errno, "Failed to create unit file %s: %m", automount_unit);
fprintf(f,
"# Automatically generated by systemd-fstab-generator\n\n"
where);
fflush(f);
- if (ferror(f)) {
- log_error("Failed to write unit file %s: %m", automount_unit);
- return -errno;
- }
+ if (ferror(f))
+ return log_error_errno(errno, "Failed to write unit file %s: %m", automount_unit);
free(lnk);
lnk = strjoin(arg_dest, "/", post, nofail ? ".wants/" : ".requires/", automount_name, NULL);
return log_oom();
mkdir_parents_label(lnk, 0755);
- if (symlink(automount_unit, lnk) < 0) {
- log_error("Failed to create symlink %s: %m", lnk);
- return -errno;
- }
+ if (symlink(automount_unit, lnk) < 0)
+ return log_error_errno(errno, "Failed to create symlink %s: %m", lnk);
}
return 0;
}
static int parse_fstab(bool initrd) {
- _cleanup_endmntent_ FILE *f;
+ _cleanup_endmntent_ FILE *f = NULL;
const char *fstab_path;
struct mntent *me;
int r = 0;
if (errno == ENOENT)
return 0;
- log_error("Failed to open %s: %m", fstab_path);
+ log_error_errno(errno, "Failed to open %s: %m", fstab_path);
return -errno;
}
while ((me = getmntent(f))) {
_cleanup_free_ char *where = NULL, *what = NULL;
+ bool noauto, nofail;
int k;
if (initrd && !mount_in_initrd(me))
if (!what)
return log_oom();
+ if (is_device_path(what) && path_is_read_only_fs("sys") > 0) {
+ log_info("Running in a container, ignoring fstab device entry for %s.", what);
+ continue;
+ }
+
where = initrd ? strappend("/sysroot/", me->mnt_dir) : strdup(me->mnt_dir);
if (!where)
return log_oom();
if (is_path(where))
path_kill_slashes(where);
- log_debug("Found entry what=%s where=%s type=%s", what, where, me->mnt_type);
+ noauto = !!hasmntopt(me, "noauto");
+ nofail = !!hasmntopt(me, "nofail");
+ log_debug("Found entry what=%s where=%s type=%s nofail=%s noauto=%s",
+ what, where, me->mnt_type,
+ yes_no(noauto), yes_no(nofail));
if (streq(me->mnt_type, "swap"))
- k = add_swap(what, me);
+ k = add_swap(what, me, noauto, nofail);
else {
- bool noauto, nofail, automount;
+ bool automount;
const char *post;
- noauto = !!hasmntopt(me, "noauto");
- nofail = !!hasmntopt(me, "nofail");
automount =
hasmntopt(me, "comment=systemd.automount") ||
hasmntopt(me, "x-systemd.automount");
else
post = SPECIAL_LOCAL_FS_TARGET;
- k = add_mount(what, where, me->mnt_type, me->mnt_opts,
- me->mnt_passno, noauto, nofail, automount,
- post, fstab_path);
+ k = add_mount(what,
+ where,
+ me->mnt_type,
+ me->mnt_opts,
+ me->mnt_passno,
+ noauto,
+ nofail,
+ automount,
+ post,
+ fstab_path);
}
if (k < 0)
return r;
}
-static int parse_new_root_from_proc_cmdline(void) {
- _cleanup_free_ char *what = NULL, *type = NULL, *opts = NULL, *line = NULL;
- bool noauto, nofail;
- char *w, *state;
- size_t l;
- int r;
+static int add_root_mount(void) {
+ _cleanup_free_ char *what = NULL;
+ const char *opts;
- r = proc_cmdline(&line);
- if (r < 0)
- log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
- if (r <= 0)
+ if (isempty(arg_root_what)) {
+ log_debug("Could not find a root= entry on the kernel command line.");
return 0;
+ }
- opts = strdup("ro");
- type = strdup("auto");
- if (!opts || !type)
- return log_oom();
-
- /* root= and roofstype= may occur more than once, the last instance should take precedence.
- * In the case of multiple rootflags= the arguments should be concatenated */
- FOREACH_WORD_QUOTED(w, l, line, state) {
- _cleanup_free_ char *word;
-
- word = strndup(w, l);
- if (!word)
- return log_oom();
-
- else if (startswith(word, "root=")) {
- free(what);
- what = fstab_node_to_udev_node(word+5);
- if (!what)
- return log_oom();
+ what = fstab_node_to_udev_node(arg_root_what);
+ if (!path_is_absolute(what)) {
+ log_debug("Skipping entry what=%s where=/sysroot type=%s", what, strna(arg_root_fstype));
+ return 0;
+ }
- } else if (startswith(word, "rootfstype=")) {
- free(type);
- type = strdup(word + 11);
- if (!type)
- return log_oom();
+ if (!arg_root_options)
+ opts = arg_root_rw > 0 ? "rw" : "ro";
+ else if (arg_root_rw >= 0 ||
+ (!mount_test_option(arg_root_options, "ro") &&
+ !mount_test_option(arg_root_options, "rw")))
+ opts = strappenda(arg_root_options, ",", arg_root_rw > 0 ? "rw" : "ro");
+ else
+ opts = arg_root_options;
+
+ log_debug("Found entry what=%s where=/sysroot type=%s", what, strna(arg_root_fstype));
+ return add_mount(what,
+ "/sysroot",
+ arg_root_fstype,
+ opts,
+ 1,
+ false,
+ false,
+ false,
+ SPECIAL_INITRD_ROOT_FS_TARGET,
+ "/proc/cmdline");
+}
- } else if (startswith(word, "rootflags=")) {
- char *o;
+static int add_usr_mount(void) {
+ _cleanup_free_ char *what = NULL;
+ const char *opts;
- o = strjoin(opts, ",", word + 10, NULL);
- if (!o)
- return log_oom();
+ if (!arg_usr_what && !arg_usr_fstype && !arg_usr_options)
+ return 0;
- free(opts);
- opts = o;
+ if (arg_root_what && !arg_usr_what) {
+ arg_usr_what = strdup(arg_root_what);
- } else if (streq(word, "ro") || streq(word, "rw")) {
- char *o;
+ if (!arg_usr_what)
+ return log_oom();
+ }
- o = strjoin(opts, ",", word, NULL);
- if (!o)
- return log_oom();
+ if (arg_root_fstype && !arg_usr_fstype) {
+ arg_usr_fstype = strdup(arg_root_fstype);
- free(opts);
- opts = o;
- }
+ if (!arg_usr_fstype)
+ return log_oom();
}
- noauto = !!strstr(opts, "noauto");
- nofail = !!strstr(opts, "nofail");
+ if (arg_root_options && !arg_usr_options) {
+ arg_usr_options = strdup(arg_root_options);
- if (!what) {
- log_debug("Could not find a root= entry on the kernel commandline.");
- return 0;
+ if (!arg_usr_options)
+ return log_oom();
}
- if (what[0] != '/') {
- log_debug("Skipping entry what=%s where=/sysroot type=%s", what, type);
+ if (!arg_usr_what)
return 0;
- }
- log_debug("Found entry what=%s where=/sysroot type=%s", what, type);
- r = add_mount(what, "/sysroot", type, opts, 1, noauto, nofail, false,
- SPECIAL_INITRD_ROOT_FS_TARGET, "/proc/cmdline");
+ what = fstab_node_to_udev_node(arg_usr_what);
+ if (!path_is_absolute(what)) {
+ log_debug("Skipping entry what=%s where=/sysroot/usr type=%s", what, strna(arg_usr_fstype));
+ return -1;
+ }
- return (r < 0) ? r : 0;
+ if (!arg_usr_options)
+ opts = arg_root_rw > 0 ? "rw" : "ro";
+ else if (!mount_test_option(arg_usr_options, "ro") &&
+ !mount_test_option(arg_usr_options, "rw"))
+ opts = strappenda(arg_usr_options, ",", arg_root_rw > 0 ? "rw" : "ro");
+ else
+ opts = arg_usr_options;
+
+ log_debug("Found entry what=%s where=/sysroot/usr type=%s", what, strna(arg_usr_fstype));
+ return add_mount(what,
+ "/sysroot/usr",
+ arg_usr_fstype,
+ opts,
+ 1,
+ false,
+ false,
+ false,
+ SPECIAL_INITRD_ROOT_FS_TARGET,
+ "/proc/cmdline");
}
static int parse_proc_cmdline_item(const char *key, const char *value) {
int r;
+ /* root=, usr=, usrfstype= and roofstype= may occur more than once, the last
+ * instance should take precedence. In the case of multiple rootflags=
+ * or usrflags= the arguments should be concatenated */
+
if (STR_IN_SET(key, "fstab", "rd.fstab") && value) {
r = parse_boolean(value);
else
arg_fstab_enabled = r;
- } else if (startswith(key, "fstab.") || startswith(key, "rd.fstab."))
- log_warning("Unknown kernel switch %s. Ignoring.", key);
+ } else if (streq(key, "root") && value) {
+
+ if (free_and_strdup(&arg_root_what, value) < 0)
+ return log_oom();
+
+ } else if (streq(key, "rootfstype") && value) {
+
+ if (free_and_strdup(&arg_root_fstype, value) < 0)
+ return log_oom();
+
+ } else if (streq(key, "rootflags") && value) {
+ char *o;
+
+ o = arg_root_options ?
+ strjoin(arg_root_options, ",", value, NULL) :
+ strdup(value);
+ if (!o)
+ return log_oom();
+
+ free(arg_root_options);
+ arg_root_options = o;
+
+ } else if (streq(key, "mount.usr") && value) {
+
+ if (free_and_strdup(&arg_usr_what, value) < 0)
+ return log_oom();
+
+ } else if (streq(key, "mount.usrfstype") && value) {
+
+ if (free_and_strdup(&arg_usr_fstype, value) < 0)
+ return log_oom();
+
+ } else if (streq(key, "mount.usrflags") && value) {
+ char *o;
+
+ o = arg_usr_options ?
+ strjoin(arg_usr_options, ",", value, NULL) :
+ strdup(value);
+ if (!o)
+ return log_oom();
+
+ free(arg_usr_options);
+ arg_usr_options = o;
+
+ } else if (streq(key, "rw") && !value)
+ arg_root_rw = true;
+ else if (streq(key, "ro") && !value)
+ arg_root_rw = false;
return 0;
}
umask(0022);
- if (parse_proc_cmdline(parse_proc_cmdline_item) < 0)
- return EXIT_FAILURE;
+ r = parse_proc_cmdline(parse_proc_cmdline_item);
+ if (r < 0)
+ log_warning_errno(r, "Failed to parse kernel command line, ignoring: %m");
- /* Always honour root= in the kernel command line if we are in an initrd */
- if (in_initrd())
- r = parse_new_root_from_proc_cmdline();
+ /* Always honour root= and usr= in the kernel command line if we are in an initrd */
+ if (in_initrd()) {
+ r = add_root_mount();
+ if (r == 0)
+ r = add_usr_mount();
+ }
/* Honour /etc/fstab only when that's enabled */
if (arg_fstab_enabled) {
int k;
+ log_debug("Parsing /etc/fstab");
+
/* Parse the local /etc/fstab, possibly from the initrd */
k = parse_fstab(false);
if (k < 0)
/* If running in the initrd also parse the /etc/fstab from the host */
if (in_initrd()) {
+ log_debug("Parsing /sysroot/etc/fstab");
+
k = parse_fstab(true);
if (k < 0)
r = k;
}
}
+ free(arg_root_what);
+ free(arg_root_fstype);
+ free(arg_root_options);
+
+ free(arg_usr_what);
+ free(arg_usr_fstype);
+ free(arg_usr_options);
+
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}
~ianmdlvl / elogind.git / blobdiff