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=5521a864df478ee139b6a27c7fc5a89630ba2882;hb=126cc76074b763c7de9edec848fb86b22e8a78ef;hpb=141a79f491fd4bf5ea0d66039065c9f9649bfc0e diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c index 5521a864d..418e8b171 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.c @@ -33,9 +33,17 @@ #include "special.h" #include "mkdir.h" #include "fileio.h" +#include "generator.h" +#include "strv.h" +#include "virt.h" static const char *arg_dest = "/tmp"; -static bool arg_enabled = true; +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; @@ -71,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"); @@ -99,7 +112,8 @@ static int add_swap(const char *what, struct mntent *me) { fprintf(f, "# Automatically generated by systemd-fstab-generator\n\n" "[Unit]\n" - "SourcePath=/etc/fstab\n\n" + "SourcePath=/etc/fstab\n" + "Documentation=man:fstab(5) man:systemd-fstab-generator(8)\n\n" "[Swap]\n" "What=%s\n", what); @@ -115,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) @@ -146,61 +165,10 @@ static bool mount_in_initrd(struct mntent *me) { streq(me->mnt_dir, "/usr"); } -static int add_fsck(FILE *f, const char *what, const char *where, const char *type, int passno) { - assert(f); - - if (passno == 0) - return 0; - - if (!is_device_path(what)) { - log_warning("Checking was requested for \"%s\", but it is not a device.", what); - return 0; - } - - if (type && !streq(type, "auto")) { - int r; - const char *checker; - - checker = strappenda("/sbin/fsck.", type); - r = access(checker, X_OK); - if (r < 0) { - log_warning("Checking was requested for %s, but %s cannot be used: %m", what, checker); - - /* treat missing check as essentially OK */ - return errno == ENOENT ? 0 : -errno; - } - } - - if (streq(where, "/")) { - char *lnk; - - lnk = strappenda(arg_dest, "/" SPECIAL_LOCAL_FS_TARGET ".wants/systemd-fsck-root.service"); - mkdir_parents_label(lnk, 0755); - if (symlink(SYSTEM_DATA_UNIT_PATH "/systemd-fsck-root.service", lnk) < 0) { - log_error("Failed to create symlink %s: %m", lnk); - return -errno; - } - } else { - _cleanup_free_ char *fsck = NULL; - - fsck = unit_name_from_path_instance("systemd-fsck", what, ".service"); - if (!fsck) - return log_oom(); - - fprintf(f, - "RequiresOverridable=%s\n" - "After=%s\n", - fsck, - fsck); - } - - 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, @@ -208,19 +176,20 @@ static int add_mount( bool automount, const char *post, const char *source) { + _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)) { @@ -232,6 +201,13 @@ static int add_mount( mount_point_ignore(where)) return 0; + if (path_equal(where, "/")) { + /* The root disk is not an option */ + automount = false; + noauto = false; + nofail = false; + } + name = unit_name_from_path(where, ".mount"); if (!name) return log_oom(); @@ -250,35 +226,38 @@ static int add_mount( } fprintf(f, - "# Automatically generated by systemd-fstab-generator\n\n" - "[Unit]\n" - "SourcePath=%s\n", - source); + "# Automatically generated by systemd-fstab-generator\n\n" + "[Unit]\n" + "SourcePath=%s\n" + "Documentation=man:fstab(5) man:systemd-fstab-generator(8)\n", + source); if (post && !noauto && !nofail && !automount) - fprintf(f, - "Before=%s\n", - post); + fprintf(f, "Before=%s\n", post); - r = add_fsck(f, what, where, type, passno); - if (r < 0) - return r; + if (passno != 0) { + r = generator_write_fsck_deps(f, arg_dest, what, where, fstype); + if (r < 0) + return r; + } fprintf(f, "\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)) { @@ -286,21 +265,19 @@ 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; } } - if (automount && !path_equal(where, "/")) { + if (automount) { automount_name = unit_name_from_path(where, ".automount"); if (!automount_name) return log_oom(); @@ -319,12 +296,13 @@ static int add_mount( fprintf(f, "# Automatically generated by systemd-fstab-generator\n\n" "[Unit]\n" - "SourcePath=%s\n", + "SourcePath=%s\n" + "Documentation=man:fstab(5) man:systemd-fstab-generator(8)\n", source); if (post) fprintf(f, - "Before= %s\n", + "Before=%s\n", post); fprintf(f, @@ -353,19 +331,19 @@ static int add_mount( return 0; } -static int parse_fstab(const char *prefix, bool initrd) { - char *fstab_path; - _cleanup_endmntent_ FILE *f; - int r = 0; +static int parse_fstab(bool initrd) { + _cleanup_endmntent_ FILE *f = NULL; + const char *fstab_path; struct mntent *me; + int r = 0; - fstab_path = strappenda(strempty(prefix), "/etc/fstab"); - f = setmntent(fstab_path, "r"); + fstab_path = initrd ? "/sysroot/etc/fstab" : "/etc/fstab"; + f = setmntent(fstab_path, "re"); if (!f) { if (errno == ENOENT) return 0; - log_error("Failed to open %s/etc/fstab: %m", strempty(prefix)); + log_error("Failed to open %s: %m", fstab_path); return -errno; } @@ -377,8 +355,16 @@ static int parse_fstab(const char *prefix, bool initrd) { continue; what = fstab_node_to_udev_node(me->mnt_fsname); - where = strjoin(strempty(prefix), me->mnt_dir, NULL); - if (!what || !where) + 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(); if (is_path(where)) @@ -398,19 +384,25 @@ static int parse_fstab(const char *prefix, bool initrd) { hasmntopt(me, "comment=systemd.automount") || hasmntopt(me, "x-systemd.automount"); - if (initrd) { + if (initrd) post = SPECIAL_INITRD_FS_TARGET; - } else if (mount_in_initrd(me)) { + else if (mount_in_initrd(me)) post = SPECIAL_INITRD_ROOT_FS_TARGET; - } else if (mount_is_network(me)) { + else if (mount_is_network(me)) post = SPECIAL_REMOTE_FS_TARGET; - } else { + 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) @@ -420,118 +412,94 @@ static int parse_fstab(const char *prefix, 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; - - 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"); +static int add_root_mount(void) { + _cleanup_free_ char *what = NULL; + const char *opts; - 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_word(const char *word) { +static int parse_proc_cmdline_item(const char *key, const char *value) { int r; - if (startswith(word, "fstab=")) { - r = parse_boolean(word + 6); + /* 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); if (r < 0) - log_warning("Failed to parse fstab switch %s. Ignoring.", word + 6); + log_warning("Failed to parse fstab switch %s. Ignoring.", value); else - arg_enabled = r; + arg_fstab_enabled = r; - } else if (startswith(word, "rd.fstab=")) { + } else if (streq(key, "root") && value) { - if (in_initrd()) { - r = parse_boolean(word + 9); - if (r < 0) - log_warning("Failed to parse fstab switch %s. Ignoring.", word + 9); - else - arg_enabled = r; - } + free(arg_root_what); + arg_root_what = strdup(value); + if (!arg_root_what) + return log_oom(); - } else if (startswith(word, "fstab.") || - (in_initrd() && startswith(word, "rd.fstab."))) { + } else if (streq(key, "rootfstype") && value) { - log_warning("Unknown kernel switch %s. Ignoring.", word); - } + 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; } int main(int argc, char *argv[]) { - int r = 0, k, l = 0; + int r = 0; if (argc > 1 && argc != 4) { log_error("This program takes three or no arguments."); @@ -547,19 +515,35 @@ int main(int argc, char *argv[]) { umask(0022); - if (parse_proc_cmdline(parse_proc_cmdline_word) < 0) + if (parse_proc_cmdline(parse_proc_cmdline_item) < 0) return EXIT_FAILURE; + /* 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(); - if (!arg_enabled) - return (r < 0) ? EXIT_FAILURE : EXIT_SUCCESS; + /* Honour /etc/fstab only when that's enabled */ + if (arg_fstab_enabled) { + int k; - k = parse_fstab(NULL, false); + log_debug("Parsing /etc/fstab"); - if (in_initrd()) - l = parse_fstab("/sysroot", true); + /* Parse the local /etc/fstab, possibly from the initrd */ + k = parse_fstab(false); + if (k < 0) + r = k; + + /* 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) || (k < 0) || (l < 0) ? EXIT_FAILURE : EXIT_SUCCESS; + return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; }