diff options
Diffstat (limited to 'src/fstab-generator/fstab-generator.c')
| -rw-r--r-- | src/fstab-generator/fstab-generator.c | 341 |
1 files changed, 184 insertions, 157 deletions
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c index 251a346c4d..f3ecc24be6 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.c @@ -79,8 +79,8 @@ static int mount_find_pri(struct mntent *me, int *ret) { } static int add_swap(const char *what, struct mntent *me) { - char *name = NULL, *unit = NULL, *lnk = NULL, *device = NULL; - FILE *f = NULL; + char _cleanup_free_ *name = NULL, *unit = NULL, *lnk = NULL, *device = NULL; + FILE _cleanup_fclose_ *f = NULL; bool noauto, nofail; int r, pri = -1; @@ -97,22 +97,20 @@ static int add_swap(const char *what, struct mntent *me) { nofail = !!hasmntopt(me, "nofail"); name = unit_name_from_path(what, ".swap"); - if (!name) { - r = log_oom(); - goto finish; - } + if (!name) + return log_oom(); unit = strjoin(arg_dest, "/", name, NULL); - if (!unit) { - r = log_oom(); - goto finish; - } + if (!unit) + return log_oom(); f = fopen(unit, "wxe"); if (!f) { - r = -errno; - log_error("Failed to create unit file: %m"); - goto finish; + 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); + return -errno; } fputs("# Automatically generated by systemd-fstab-generator\n\n" @@ -138,57 +136,40 @@ static int add_swap(const char *what, struct mntent *me) { fflush(f); if (ferror(f)) { - log_error("Failed to write unit file: %m"); - r = -errno; - goto finish; + log_error("Failed to write unit file %s: %m", unit); + return -errno; } if (!noauto) { lnk = strjoin(arg_dest, "/" SPECIAL_SWAP_TARGET ".wants/", name, NULL); - if (!lnk) { - r = log_oom(); - goto finish; - } + if (!lnk) + return log_oom(); mkdir_parents_label(lnk, 0755); if (symlink(unit, lnk) < 0) { - log_error("Failed to create symlink: %m"); - r = -errno; - goto finish; + log_error("Failed to create symlink %s: %m", lnk); + return -errno; } r = device_name(what, &device); if (r < 0) - goto finish; + return r; if (r > 0) { free(lnk); lnk = strjoin(arg_dest, "/", device, ".wants/", name, NULL); - if (!lnk) { - r = log_oom(); - goto finish; - } + if (!lnk) + return log_oom(); mkdir_parents_label(lnk, 0755); if (symlink(unit, lnk) < 0) { - log_error("Failed to create symlink: %m"); - r = -errno; - goto finish; + log_error("Failed to create symlink %s: %m", lnk); + return -errno; } } } - r = 0; -finish: - if (f) - fclose(f); - - free(unit); - free(lnk); - free(name); - free(device); - - return r; + return 0; } static bool mount_is_bind(struct mntent *me) { @@ -196,7 +177,7 @@ static bool mount_is_bind(struct mntent *me) { return hasmntopt(me, "bind") || - streq(me->mnt_opts, "bind"); + streq(me->mnt_type, "bind"); } static bool mount_is_network(struct mntent *me) { @@ -207,18 +188,23 @@ 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) { - char *name = NULL, *unit = NULL, *lnk = NULL, *device = NULL, *automount_name = NULL, *automount_unit = NULL; - FILE *f = NULL; - bool noauto, nofail, automount, isbind, isnetwork; +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 _cleanup_free_ + *name = NULL, *unit = NULL, *lnk = NULL, *device = NULL, + *automount_name = NULL, *automount_unit = NULL; + FILE _cleanup_fclose_ *f = NULL; 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)) { @@ -230,15 +216,6 @@ static int add_mount(const char *what, const char *where, struct mntent *me) { 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; @@ -248,28 +225,28 @@ static int add_mount(const char *what, const char *where, struct mntent *me) { } name = unit_name_from_path(where, ".mount"); - if (!name) { - r = log_oom(); - goto finish; - } + if (!name) + return log_oom(); unit = strjoin(arg_dest, "/", name, NULL); - if (!unit) { - r = log_oom(); - goto finish; - } + if (!unit) + return log_oom(); f = fopen(unit, "wxe"); if (!f) { - r = -errno; - log_error("Failed to create unit file: %m"); - goto finish; + 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); + return -errno; } - 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, @@ -295,34 +272,34 @@ static int add_mount(const char *what, const char *where, struct mntent *me) { "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"); - r = -errno; - goto finish; + log_error("Failed to write unit file %s: %m", unit); + return -errno; } if (!noauto) { lnk = strjoin(arg_dest, "/", post, nofail || automount ? ".wants/" : ".requires/", name, NULL); - if (!lnk) { - r = log_oom(); - goto finish; - } + if (!lnk) + return log_oom(); mkdir_parents_label(lnk, 0755); if (symlink(unit, lnk) < 0) { - log_error("Failed to create symlink: %m"); - r = -errno; - goto finish; + log_error("Failed to create symlink %s: %m", lnk); + return -errno; } if (!isbind && @@ -330,21 +307,18 @@ static int add_mount(const char *what, const char *where, struct mntent *me) { r = device_name(what, &device); if (r < 0) - goto finish; + return r; if (r > 0) { free(lnk); lnk = strjoin(arg_dest, "/", device, ".wants/", name, NULL); - if (!lnk) { - r = log_oom(); - goto finish; - } + if (!lnk) + return log_oom(); mkdir_parents_label(lnk, 0755); if (symlink(unit, lnk) < 0) { - log_error("Failed to create symlink: %m"); - r = -errno; - goto finish; + log_error("Failed to create symlink %s: %m", lnk); + return -errno; } } } @@ -352,23 +326,18 @@ static int add_mount(const char *what, const char *where, struct mntent *me) { if (automount && !path_equal(where, "/")) { automount_name = unit_name_from_path(where, ".automount"); - if (!name) { - r = log_oom(); - goto finish; - } + if (!name) + return log_oom(); automount_unit = strjoin(arg_dest, "/", automount_name, NULL); - if (!automount_unit) { - r = log_oom(); - goto finish; - } + if (!automount_unit) + return log_oom(); fclose(f); f = fopen(automount_unit, "wxe"); if (!f) { - r = -errno; - log_error("Failed to create unit file: %m"); - goto finish; + log_error("Failed to create unit file %s: %m", automount_unit); + return -errno; } fprintf(f, @@ -386,39 +355,23 @@ static int add_mount(const char *what, const char *where, struct mntent *me) { fflush(f); if (ferror(f)) { - log_error("Failed to write unit file: %m"); - r = -errno; - goto finish; + log_error("Failed to write unit file %s: %m", automount_unit); + return -errno; } free(lnk); lnk = strjoin(arg_dest, "/", post, nofail ? ".wants/" : ".requires/", automount_name, NULL); - if (!lnk) { - r = log_oom(); - goto finish; - } + if (!lnk) + return log_oom(); mkdir_parents_label(lnk, 0755); if (symlink(automount_unit, lnk) < 0) { - log_error("Failed to create symlink: %m"); - r = -errno; - goto finish; + log_error("Failed to create symlink %s: %m", lnk); + return -errno; } } - r = 0; -finish: - if (f) - fclose(f); - - free(unit); - free(lnk); - free(name); - free(device); - free(automount_name); - free(automount_unit); - - return r; + return 0; } static int parse_fstab(void) { @@ -437,19 +390,13 @@ static int parse_fstab(void) { } while ((me = getmntent(f))) { - char *where, *what; + char _cleanup_free_ *where = NULL, *what = NULL; int k; what = fstab_node_to_udev_node(me->mnt_fsname); - if (!what) { - r = log_oom(); - goto finish; - } - where = strdup(me->mnt_dir); - if (!where) { + if (!what || !where) { r = log_oom(); - free(what); goto finish; } @@ -460,11 +407,22 @@ static int parse_fstab(void) { if (streq(me->mnt_type, "swap")) k = add_swap(what, me); - else - k = add_mount(what, where, me); - - free(what); - free(where); + 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"); + } if (k < 0) r = k; @@ -475,8 +433,82 @@ finish: return r; } +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"); + 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) { + 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; + char _cleanup_free_ *line = NULL; + char *w, *state; int r; size_t l; @@ -490,13 +522,11 @@ static int parse_proc_cmdline(void) { } FOREACH_WORD_QUOTED(w, l, line, state) { - char *word; + char _cleanup_free_ *word = NULL; word = strndup(w, l); - if (!word) { - r = log_oom(); - goto finish; - } + if (!word) + return log_oom(); if (startswith(word, "fstab=")) { r = parse_boolean(word + 6); @@ -520,19 +550,13 @@ static int parse_proc_cmdline(void) { log_warning("Unknown kernel switch %s. Ignoring.", word); } - - free(word); } - r = 0; - -finish: - free(line); - return r; + return 0; } int main(int argc, char *argv[]) { - int r; + int r, k = 0; if (argc > 1 && argc != 4) { log_error("This program takes three or no arguments."); @@ -551,10 +575,13 @@ int main(int argc, char *argv[]) { 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; } |