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=32a8f9bd514685432f785619a1715b67e32d8b43;hp=57d0a53f2847051759f3cd4c999ed84c64b86023;hb=9f03ee51a2207954ef18be79ca3e11cd14ca56fd;hpb=6db615c17ee7a434f9e0c40d67a1f833d8f3cc9d diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c index 57d0a53f2..32a8f9bd5 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.c @@ -35,6 +35,7 @@ #include "fileio.h" #include "generator.h" #include "strv.h" +#include "virt.h" static const char *arg_dest = "/tmp"; static bool arg_fstab_enabled = true; @@ -42,45 +43,98 @@ 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 mount_find_discard(struct mntent *me, char **ret) { + char *opt, *ans; + size_t len; + + assert(me); + assert(ret); + + opt = hasmntopt(me, "discard"); + if (!opt) + return 0; + + opt += strlen("discard"); + + if (*opt == ',' || *opt == '\0') + ans = strdup("all"); + else { + if (*opt != '=') + return -EINVAL; + + len = strcspn(opt + 1, ","); + if (len == 0) + return -EINVAL; + + ans = strndup(opt + 1, len); + } + + if (!ans) + return -ENOMEM; + + *ret = ans; + return 1; +} + static int add_swap(const char *what, struct mntent *me) { _cleanup_free_ char *name = NULL, *unit = NULL, *lnk = NULL; _cleanup_fclose_ FILE *f = NULL; + _cleanup_free_ char *discard = NULL; + bool noauto; int r, pri = -1; 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"); - return pri; + return r; + } + + r = mount_find_discard(me, &discard); + if (r < 0) { + log_error("Failed to parse discard"); + return r; } noauto = !!hasmntopt(me, "noauto"); @@ -112,9 +166,10 @@ static int add_swap(const char *what, struct mntent *me) { what); if (pri >= 0) - fprintf(f, - "Priority=%i\n", - pri); + fprintf(f, "Priority=%i\n", pri); + + if (discard) + fprintf(f, "Discard=%s\n", discard); fflush(f); if (ferror(f)) { @@ -122,6 +177,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) @@ -167,7 +227,8 @@ 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; @@ -189,6 +250,7 @@ static int add_mount( return 0; if (path_equal(where, "/")) { + /* The root disk is not an option */ automount = false; noauto = false; nofail = false; @@ -219,9 +281,7 @@ 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, fstype); @@ -240,8 +300,12 @@ static int add_mount( if (!isempty(fstype) && !streq(fstype, "auto")) fprintf(f, "Type=%s\n", fstype); - if (!isempty(opts) && !streq(opts, "defaults")) - fprintf(f, "Options=%s\n", opts); + 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)) { @@ -249,17 +313,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; } } @@ -344,6 +406,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(); @@ -394,8 +461,8 @@ static int parse_fstab(bool initrd) { } static int add_root_mount(void) { - _cleanup_free_ char *o = NULL, *what = NULL; - bool noauto, nofail; + _cleanup_free_ char *what = NULL; + const char *opts; if (isempty(arg_root_what)) { log_debug("Could not find a root= entry on the kernel commandline."); @@ -409,28 +476,74 @@ static int add_root_mount(void) { } if (!arg_root_options) - o = strdup(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"))) - o = strjoin(arg_root_options, ",", arg_root_rw > 0 ? "rw" : "ro", NULL); - else - o = strdup(arg_root_options); - } - if (!o) - return log_oom(); - - noauto = mount_test_option(arg_root_options, "noauto"); - nofail = mount_test_option(arg_root_options, "nofail"); + 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, - o, + opts, + 1, + false, + false, + false, + SPECIAL_INITRD_ROOT_FS_TARGET, + "/proc/cmdline"); +} + +static int add_usr_mount(void) { + _cleanup_free_ char *what = NULL; + const char *opts; + + if (!arg_usr_what && !arg_usr_fstype && !arg_usr_options) + return 0; + + if (arg_root_what && !arg_usr_what) { + arg_usr_what = strdup(arg_root_what); + + if (!arg_usr_what) + return log_oom(); + } + + if (arg_root_fstype && !arg_usr_fstype) { + arg_usr_fstype = strdup(arg_root_fstype); + + if (!arg_usr_fstype) + return log_oom(); + } + + if (arg_root_options && !arg_usr_options) { + arg_usr_options = strdup(arg_root_options); + + if (!arg_usr_options) + return log_oom(); + } + + if (!arg_usr_what || !arg_usr_options) + return 0; + + 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; + } + + 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, - noauto, nofail, + false, + false, false, SPECIAL_INITRD_ROOT_FS_TARGET, "/proc/cmdline"); @@ -439,9 +552,9 @@ static int add_root_mount(void) { 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 */ + /* 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) { @@ -453,16 +566,12 @@ static int parse_proc_cmdline_item(const char *key, const char *value) { } else if (streq(key, "root") && value) { - free(arg_root_what); - arg_root_what = strdup(value); - if (!arg_root_what) + if (free_and_strdup(&arg_root_what, value) < 0) return log_oom(); } else if (streq(key, "rootfstype") && value) { - free(arg_root_fstype); - arg_root_fstype = strdup(value); - if (!arg_root_fstype) + if (free_and_strdup(&arg_root_fstype, value) < 0) return log_oom(); } else if (streq(key, "rootflags") && value) { @@ -477,12 +586,32 @@ static int parse_proc_cmdline_item(const char *key, const char *value) { 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; - else if (startswith(key, "fstab.") || startswith(key, "rd.fstab.")) - log_warning("Unknown kernel switch %s. Ignoring.", key); return 0; } @@ -507,14 +636,19 @@ int main(int argc, char *argv[]) { 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()) + /* 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) @@ -522,11 +656,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; }