#include "mount-setup.h"
#include "special.h"
#include "mkdir.h"
+#include "virt.h"
static const char *arg_dest = "/tmp";
+static bool arg_enabled = true;
static int device_name(const char *path, char **unit) {
char *p;
p = unit_name_from_path(path, ".device");
if (!p)
- return -ENOMEM;
+ return log_oom();
*unit = p;
return 1;
name = unit_name_from_path(what, ".swap");
if (!name) {
- log_error("Out of memory");
- r = -ENOMEM;
+ r = log_oom();
goto finish;
}
- unit = join(arg_dest, "/", name, NULL);
+ unit = strjoin(arg_dest, "/", name, NULL);
if (!unit) {
- log_error("Out of memory");
- r = -ENOMEM;
+ r = log_oom();
goto finish;
}
f = fopen(unit, "wxe");
if (!f) {
r = -errno;
- log_error("Failed to create unit file: %m");
+ 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);
goto finish;
}
fflush(f);
if (ferror(f)) {
- log_error("Failed to write unit file: %m");
+ log_error("Failed to write unit file %s: %m", unit);
r = -errno;
goto finish;
}
if (!noauto) {
- lnk = join(arg_dest, "/" SPECIAL_SWAP_TARGET ".wants/", name, NULL);
+ lnk = strjoin(arg_dest, "/" SPECIAL_SWAP_TARGET ".wants/", name, NULL);
if (!lnk) {
- log_error("Out of memory");
- r = -ENOMEM;
+ r = log_oom();
goto finish;
}
mkdir_parents_label(lnk, 0755);
if (symlink(unit, lnk) < 0) {
- log_error("Failed to create symlink: %m");
+ log_error("Failed to create symlink %s: %m", lnk);
r = -errno;
goto finish;
}
r = device_name(what, &device);
- if (r < 0) {
- log_error("Out of memory");
- r = -ENOMEM;
+ if (r < 0)
goto finish;
- }
if (r > 0) {
free(lnk);
- lnk = join(arg_dest, "/", device, ".wants/", name, NULL);
+ lnk = strjoin(arg_dest, "/", device, ".wants/", name, NULL);
if (!lnk) {
- log_error("Out of memory");
- r = -ENOMEM;
+ r = log_oom();
goto finish;
}
mkdir_parents_label(lnk, 0755);
if (symlink(unit, lnk) < 0) {
- log_error("Failed to create symlink: %m");
+ log_error("Failed to create symlink %s: %m", lnk);
r = -errno;
goto finish;
}
return
hasmntopt(me, "bind") ||
- streq(me->mnt_opts, "bind");
+ streq(me->mnt_type, "bind");
}
static bool mount_is_network(struct mntent *me) {
fstype_is_network(me->mnt_type);
}
-static int add_mount(const char *what, const char *where, struct mntent *me) {
+static int add_mount(const char *what, const char *where, const char *type, const char *opts,
+ int passno, bool wait, bool noauto, bool nofail, bool automount, bool isbind, bool isnetwork,
+ const char *source) {
char *name = NULL, *unit = NULL, *lnk = NULL, *device = NULL, *automount_name = NULL, *automount_unit = NULL;
FILE *f = NULL;
- bool noauto, nofail, automount, isbind, isnetwork;
int r;
const char *post, *pre;
assert(what);
assert(where);
- assert(me);
+ assert(type);
+ assert(opts);
+ assert(source);
- if (streq(me->mnt_type, "autofs"))
+ if (streq(type, "autofs"))
return 0;
if (!is_path(where)) {
mount_point_ignore(where))
return 0;
- isnetwork = mount_is_network(me);
- isbind = mount_is_bind(me);
-
- noauto = !!hasmntopt(me, "noauto");
- nofail = !!hasmntopt(me, "nofail");
- automount =
- hasmntopt(me, "comment=systemd.automount") ||
- hasmntopt(me, "x-systemd.automount");
-
if (isnetwork) {
post = SPECIAL_REMOTE_FS_TARGET;
pre = SPECIAL_REMOTE_FS_PRE_TARGET;
}
name = unit_name_from_path(where, ".mount");
- if (!name) {
- log_error("Out of memory");
- r = -ENOMEM;
+ if (!name) {
+ r = log_oom();
goto finish;
}
- unit = join(arg_dest, "/", name, NULL);
+ unit = strjoin(arg_dest, "/", name, NULL);
if (!unit) {
- log_error("Out of memory");
- r = -ENOMEM;
+ r = log_oom();
goto finish;
}
f = fopen(unit, "wxe");
if (!f) {
r = -errno;
- log_error("Failed to create unit file: %m");
+ 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);
goto finish;
}
- fputs("# Automatically generated by systemd-fstab-generator\n\n"
+ fprintf(f,
+ "# Automatically generated by systemd-fstab-generator\n\n"
"[Unit]\n"
- "SourcePath=/etc/fstab\n"
- "DefaultDependencies=no\n", f);
+ "SourcePath=%s\n"
+ "DefaultDependencies=no\n",
+ source);
if (!path_equal(where, "/"))
fprintf(f,
"FsckPassNo=%i\n",
what,
where,
- me->mnt_type,
- me->mnt_passno);
+ type,
+ passno);
- if (!isempty(me->mnt_opts) &&
- !streq(me->mnt_opts, "defaults"))
+ if (!isempty(opts) &&
+ !streq(opts, "defaults"))
fprintf(f,
"Options=%s\n",
- me->mnt_opts);
+ opts);
+
+ if (wait)
+ fprintf(f,
+ "TimeoutSec=0\n");
fflush(f);
if (ferror(f)) {
- log_error("Failed to write unit file: %m");
+ log_error("Failed to write unit file %s: %m", unit);
r = -errno;
goto finish;
}
if (!noauto) {
- lnk = join(arg_dest, "/", post, nofail || automount ? ".wants/" : ".requires/", name, NULL);
+ lnk = strjoin(arg_dest, "/", post, nofail || automount ? ".wants/" : ".requires/", name, NULL);
if (!lnk) {
- log_error("Out of memory");
- r = -ENOMEM;
+ r = log_oom();
goto finish;
}
mkdir_parents_label(lnk, 0755);
if (symlink(unit, lnk) < 0) {
- log_error("Failed to create symlink: %m");
+ log_error("Failed to create symlink %s: %m", lnk);
r = -errno;
goto finish;
}
!path_equal(where, "/")) {
r = device_name(what, &device);
- if (r < 0) {
- log_error("Out of memory");
- r = -ENOMEM;
+ if (r < 0)
goto finish;
- }
if (r > 0) {
free(lnk);
- lnk = join(arg_dest, "/", device, ".wants/", name, NULL);
+ lnk = strjoin(arg_dest, "/", device, ".wants/", name, NULL);
if (!lnk) {
- log_error("Out of memory");
- r = -ENOMEM;
+ r = log_oom();
goto finish;
}
mkdir_parents_label(lnk, 0755);
if (symlink(unit, lnk) < 0) {
- log_error("Failed to creat symlink: %m");
+ log_error("Failed to create symlink %s: %m", lnk);
r = -errno;
goto finish;
}
if (automount && !path_equal(where, "/")) {
automount_name = unit_name_from_path(where, ".automount");
if (!name) {
- log_error("Out of memory");
- r = -ENOMEM;
+ r = log_oom();
goto finish;
}
- automount_unit = join(arg_dest, "/", automount_name, NULL);
+ automount_unit = strjoin(arg_dest, "/", automount_name, NULL);
if (!automount_unit) {
- log_error("Out of memory");
- r = -ENOMEM;
+ r = log_oom();
goto finish;
}
f = fopen(automount_unit, "wxe");
if (!f) {
r = -errno;
- log_error("Failed to create unit file: %m");
+ log_error("Failed to create unit file %s: %m", automount_unit);
goto finish;
}
fflush(f);
if (ferror(f)) {
- log_error("Failed to write unit file: %m");
+ log_error("Failed to write unit file %s: %m", automount_unit);
r = -errno;
goto finish;
}
free(lnk);
- lnk = join(arg_dest, "/", post, nofail ? ".wants/" : ".requires/", automount_name, NULL);
+ lnk = strjoin(arg_dest, "/", post, nofail ? ".wants/" : ".requires/", automount_name, NULL);
if (!lnk) {
- log_error("Out of memory");
- r = -ENOMEM;
+ r = log_oom();
goto finish;
}
mkdir_parents_label(lnk, 0755);
if (symlink(automount_unit, lnk) < 0) {
- log_error("Failed to create symlink: %m");
+ log_error("Failed to create symlink %s: %m", lnk);
r = -errno;
goto finish;
}
what = fstab_node_to_udev_node(me->mnt_fsname);
if (!what) {
- log_error("Out of memory");
- r = -ENOMEM;
+ r = log_oom();
goto finish;
}
where = strdup(me->mnt_dir);
if (!where) {
- log_error("Out of memory");
+ r = log_oom();
free(what);
- r = -ENOMEM;
goto finish;
}
- if (is_path(what))
- path_kill_slashes(what);
-
if (is_path(where))
path_kill_slashes(where);
if (streq(me->mnt_type, "swap"))
k = add_swap(what, me);
- else
- k = add_mount(what, where, me);
+ else {
+ bool noauto, nofail, automount, isbind, isnetwork;
+
+ noauto = !!hasmntopt(me, "noauto");
+ nofail = !!hasmntopt(me, "nofail");
+ automount =
+ hasmntopt(me, "comment=systemd.automount") ||
+ hasmntopt(me, "x-systemd.automount");
+ isbind = mount_is_bind(me);
+ isnetwork = mount_is_network(me);
+
+ k = add_mount(what, where, me->mnt_type, me->mnt_opts,
+ me->mnt_passno, false, noauto, nofail,
+ automount, isbind, isnetwork,
+ "/etc/fstab");
+ }
free(what);
free(where);
return r;
}
-int main(int argc, char *argv[]) {
+static int parse_new_root_from_proc_cmdline(void) {
+ char *w, *state;
+ _cleanup_free_ char *what = NULL, *type = NULL, *opts = NULL, *line = NULL;
int r;
+ size_t l;
+ bool wait = false;
+
+ r = read_one_line_file("/proc/cmdline", &line);
+ if (r < 0) {
+ log_error("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
+ return 0;
+ }
+
+ opts = strdup("defaults");
+ if (!opts)
+ return log_oom();
+ type = strdup("auto");
+ if (!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) {
+ char *word, *tmp_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();
+
+ } else if (startswith(word, "rootfstype=")) {
+ free(type);
+ type = strdup(word + 11);
+ if (!type)
+ return log_oom();
+
+ } else if (startswith(word, "rootflags=")) {
+ tmp_word = opts;
+ opts = strjoin(opts, ",", word + 10, NULL);
+ free(tmp_word);
+ if (!opts)
+ return log_oom();
+
+ } else if (streq(word, "ro") || streq(word, "rw")) {
+ tmp_word = opts;
+ opts = strjoin(opts, ",", word, NULL);
+ free(tmp_word);
+ if (!opts)
+ return log_oom();
+
+ } else if (streq(word, "rootwait"))
+ wait = true;
+
+ free(word);
+ }
+
+ if (what) {
+
+ log_debug("Found entry what=%s where=/new_root type=%s", what, type);
+ r = add_mount(what, "/new_root", type, opts, 0, wait, false, false,
+ false, false, false, "/proc/cmdline");
+
+ if (r < 0)
+ return r;
+ } else
+ log_error("Could not find a root= entry on the kernel commandline.");
+
+ return 0;
+}
+
+static int parse_proc_cmdline(void) {
+ char *line, *w, *state;
+ int r;
+ size_t l;
+
+ if (detect_container(NULL) > 0)
+ return 0;
+
+ r = read_one_line_file("/proc/cmdline", &line);
+ if (r < 0) {
+ log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
+ return 0;
+ }
+
+ FOREACH_WORD_QUOTED(w, l, line, state) {
+ char *word;
+
+ word = strndup(w, l);
+ if (!word) {
+ r = log_oom();
+ goto finish;
+ }
+
+ if (startswith(word, "fstab=")) {
+ r = parse_boolean(word + 6);
+ if (r < 0)
+ log_warning("Failed to parse fstab switch %s. Ignoring.", word + 6);
+ else
+ arg_enabled = r;
+
+ } else if (startswith(word, "rd.fstab=")) {
+
+ if (in_initrd()) {
+ r = parse_boolean(word + 6);
+ if (r < 0)
+ log_warning("Failed to parse fstab switch %s. Ignoring.", word + 6);
+ else
+ arg_enabled = r;
+ }
+
+ } else if (startswith(word, "fstab.") ||
+ (in_initrd() && startswith(word, "rd.fstab."))) {
+
+ log_warning("Unknown kernel switch %s. Ignoring.", word);
+ }
+
+ free(word);
+ }
+
+ r = 0;
+
+finish:
+ free(line);
+ return r;
+}
+
+int main(int argc, char *argv[]) {
+ int r, k = 0;
if (argc > 1 && argc != 4) {
log_error("This program takes three or no arguments.");
umask(0022);
+ if (parse_proc_cmdline() < 0)
+ return EXIT_FAILURE;
+
+ if (in_initrd())
+ k = parse_new_root_from_proc_cmdline();
+
+ if (!arg_enabled)
+ return EXIT_SUCCESS;
+
r = parse_fstab();
- return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
+ return (r < 0) || (k < 0) ? EXIT_FAILURE : EXIT_SUCCESS;
}
~ianmdlvl / elogind.git / blobdiff