X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ffstab-generator%2Ffstab-generator.c;h=418e8b171dbd5ea118625905c69d3196359c7593;hp=248a4ceb90d4d8af4aeace4f31cb1f88c18583a1;hb=e70bc43cdf75b36e7ad3d29e9a6f8ee1461e7d5e;hpb=c3834f9b881f2b1a68dc7d797c134f0b66b47b57 diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c index 248a4ceb9..418e8b171 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.c @@ -35,9 +35,15 @@ #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 int mount_find_pri(struct mntent *me, int *ret) { char *end, *pri; @@ -73,6 +79,11 @@ static int add_swap(const char *what, struct mntent *me) { assert(what); assert(me); + 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"); @@ -118,6 +129,11 @@ static int add_swap(const char *what, struct mntent *me) { return -errno; } + /* 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); if (!lnk) @@ -152,7 +168,7 @@ static bool mount_in_initrd(struct mntent *me) { static int add_mount( const char *what, const char *where, - const char *type, + const char *fstype, const char *opts, int passno, bool noauto, @@ -163,17 +179,17 @@ static int add_mount( _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)) { @@ -186,6 +202,7 @@ static int add_mount( return 0; if (path_equal(where, "/")) { + /* The root disk is not an option */ automount = false; noauto = false; nofail = false; @@ -216,12 +233,10 @@ static int add_mount( 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; } @@ -230,16 +245,19 @@ static int add_mount( "\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)) { @@ -247,17 +265,15 @@ static int add_mount( return -errno; } - 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) { + log_error("Failed to create symlink %s: %m", lnk); + return -errno; } } @@ -316,7 +332,7 @@ static int add_mount( } 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; @@ -342,6 +358,11 @@ static int parse_fstab(bool initrd) { if (!what) return log_oom(); + if (detect_container(NULL) > 0 && is_device_path(what)) { + 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(); @@ -372,9 +393,16 @@ static int parse_fstab(bool initrd) { 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) @@ -384,90 +412,50 @@ static int parse_fstab(bool initrd) { 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; - - r = proc_cmdline(&line); - if (r < 0) - log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r)); - if (r <= 0) - 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; +static int add_root_mount(void) { + _cleanup_free_ char *what = NULL; + const char *opts; - 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=")) { - char *o; - - o = strjoin(opts, ",", word + 10, NULL); - if (!o) - return log_oom(); - - free(opts); - opts = o; - - } else if (streq(word, "ro") || streq(word, "rw")) { - char *o; - - o = strjoin(opts, ",", word, NULL); - if (!o) - return log_oom(); - - free(opts); - opts = o; - } - } - - noauto = !!strstr(opts, "noauto"); - nofail = !!strstr(opts, "nofail"); - - if (!what) { + if (isempty(arg_root_what)) { log_debug("Could not find a root= entry on the kernel commandline."); return 0; } - if (what[0] != '/') { - log_debug("Skipping entry what=%s where=/sysroot type=%s", what, type); + 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; } - 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"); - - return (r < 0) ? r : 0; + 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 = strappenda3(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"); } static int parse_proc_cmdline_item(const char *key, const char *value) { int r; + /* 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 */ + if (STR_IN_SET(key, "fstab", "rd.fstab") && value) { r = parse_boolean(value); @@ -476,8 +464,36 @@ static int parse_proc_cmdline_item(const char *key, const char *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) { + + free(arg_root_what); + arg_root_what = strdup(value); + if (!arg_root_what) + return log_oom(); + + } else if (streq(key, "rootfstype") && value) { + + free(arg_root_fstype); + arg_root_fstype = strdup(value); + if (!arg_root_fstype) + 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, "rw") && !value) + arg_root_rw = true; + else if (streq(key, "ro") && !value) + arg_root_rw = false; return 0; } @@ -504,12 +520,14 @@ int main(int argc, char *argv[]) { /* Always honour root= in the kernel command line if we are in an initrd */ if (in_initrd()) - r = parse_new_root_from_proc_cmdline(); + r = add_root_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) @@ -517,11 +535,15 @@ int main(int argc, char *argv[]) { /* 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); + return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; }