X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ffstab-generator%2Ffstab-generator.c;h=e257c121e5e8c96557df53f3dc9c0cd05c762566;hb=f1f00dbb7f3741b30d4a26b1a8b65ec46ff1fde3;hp=5dafcba3c097044c3ab31626bdfe03eaf91a3cde;hpb=4f52d3fe2da7c3449b7fbfaa7c64a83354d3b56c;p=elogind.git diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c index 5dafcba3c..e257c121e 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.c @@ -43,7 +43,9 @@ 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, *opt; @@ -57,7 +59,6 @@ static int mount_find_pri(struct mntent *me, int *ret) { return 0; opt += strlen("pri"); - if (*opt != '=') return -EINVAL; @@ -73,43 +74,9 @@ static int mount_find_pri(struct mntent *me, int *ret) { 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; @@ -128,12 +95,6 @@ static int add_swap(const char *what, struct mntent *me) { return r; } - r = mount_find_discard(me, &discard); - if (r < 0) { - log_error("Failed to parse discard"); - return r; - } - noauto = !!hasmntopt(me, "noauto"); name = unit_name_from_path(what, ".swap"); @@ -162,16 +123,18 @@ static int add_swap(const char *what, struct mntent *me) { "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); - if (discard) - fprintf(f, "Discard=%s\n", discard); + if (!isempty(me->mnt_opts) && !streq(me->mnt_opts, "defaults")) + fprintf(f, "Options=%s\n", me->mnt_opts); - fflush(f); - if (ferror(f)) { - log_error("Failed to write unit file %s: %m", unit); - return -errno; + r = fflush_and_check(f); + if (r < 0) { + log_error("Failed to write unit file %s: %s", unit, strerror(-r)); + return r; } /* use what as where, to have a nicer error message */ @@ -494,12 +457,64 @@ static int add_root_mount(void) { "/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, + 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 */ + /* 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) { @@ -511,16 +526,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) { @@ -535,6 +546,28 @@ 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) @@ -563,9 +596,12 @@ 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) {