X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ffstab-generator%2Ffstab-generator.c;h=d5f9db49ca8b6016afd34bb5548070bad0ee5067;hp=3a59b85d665b5884cbcabc801c91e4bde7e9243c;hb=790838e4f16831f2bb06aeb845b9e2fb0f1d28dd;hpb=b7def684941808600c344f0be7a2b9fcdda97e0f diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c index 3a59b85d6..d5f9db49c 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.c @@ -33,6 +33,7 @@ #include "special.h" #include "mkdir.h" #include "virt.h" +#include "fileio.h" static const char *arg_dest = "/tmp"; static bool arg_enabled = true; @@ -47,7 +48,7 @@ static int device_name(const char *path, char **unit) { p = unit_name_from_path(path, ".device"); if (!p) - return -ENOMEM; + return log_oom(); *unit = p; return 1; @@ -79,8 +80,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,24 +98,20 @@ static int add_swap(const char *what, struct mntent *me) { nofail = !!hasmntopt(me, "nofail"); name = unit_name_from_path(what, ".swap"); - if (!name) { - log_error("Out of memory"); - r = -ENOMEM; - goto finish; - } + if (!name) + return log_oom(); unit = strjoin(arg_dest, "/", name, NULL); - if (!unit) { - log_error("Out of memory"); - r = -ENOMEM; - 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" @@ -140,62 +137,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) { - log_error("Out of memory"); - r = -ENOMEM; - 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) { - log_error("Out of memory"); - r = -ENOMEM; - goto finish; - } + if (r < 0) + return r; if (r > 0) { free(lnk); lnk = strjoin(arg_dest, "/", device, ".wants/", name, NULL); - if (!lnk) { - log_error("Out of memory"); - r = -ENOMEM; - 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) { @@ -203,7 +178,9 @@ static bool mount_is_bind(struct mntent *me) { return hasmntopt(me, "bind") || - streq(me->mnt_opts, "bind"); + streq(me->mnt_type, "bind") || + hasmntopt(me, "rbind") || + streq(me->mnt_type, "rbind"); } static bool mount_is_network(struct mntent *me) { @@ -214,18 +191,36 @@ 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 bool mount_in_initrd(struct mntent *me) { + assert(me); + + return + hasmntopt(me, "x-initrd.mount") || + streq(me->mnt_dir, "/usr"); +} + +static bool mount_is_rootfs(struct mntent *me) { + assert(me); + + return hasmntopt(me, "x-initrd.rootfs"); +} + +static int add_mount(const char *what, const char *where, const char *type, const char *opts, + int passno, bool noauto, bool nofail, bool automount, bool isbind, + const char *pre, const char *post, 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)) { @@ -237,60 +232,43 @@ 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; - } else { - post = SPECIAL_LOCAL_FS_TARGET; - pre = SPECIAL_LOCAL_FS_PRE_TARGET; - } - name = unit_name_from_path(where, ".mount"); - if (!name) { - log_error("Out of memory"); - r = -ENOMEM; - goto finish; - } + if (!name) + return log_oom(); unit = strjoin(arg_dest, "/", name, NULL); - if (!unit) { - log_error("Out of memory"); - r = -ENOMEM; - 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); - - if (!path_equal(where, "/")) + "SourcePath=%s\n" + "DefaultDependencies=no\n", + source); + + if (!path_equal(where, "/")) { + if (pre) + fprintf(f, + "After=%s\n" + "Wants=%s\n", + pre, + pre); fprintf(f, - "After=%s\n" - "Wants=%s\n" "Conflicts=" SPECIAL_UMOUNT_TARGET "\n" - "Before=" SPECIAL_UMOUNT_TARGET "\n", - pre, - pre); - + "Before=" SPECIAL_UMOUNT_TARGET "\n"); + } - if (!noauto && !nofail && !automount) + if (post && !noauto && !nofail && !automount) fprintf(f, "Before=%s\n", post); @@ -304,61 +282,51 @@ 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); 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) { - log_error("Out of memory"); - r = -ENOMEM; - goto finish; - } + 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: %m"); - r = -errno; - goto finish; + mkdir_parents_label(lnk, 0755); + if (symlink(unit, lnk) < 0) { + log_error("Failed to create symlink %s: %m", lnk); + return -errno; + } } if (!isbind && !path_equal(where, "/")) { r = device_name(what, &device); - if (r < 0) { - log_error("Out of memory"); - r = -ENOMEM; - goto finish; - } + if (r < 0) + return r; if (r > 0) { free(lnk); lnk = strjoin(arg_dest, "/", device, ".wants/", name, NULL); - if (!lnk) { - log_error("Out of memory"); - r = -ENOMEM; - goto finish; - } + if (!lnk) + return log_oom(); mkdir_parents_label(lnk, 0755); if (symlink(unit, lnk) < 0) { - log_error("Failed to creat symlink: %m"); - r = -errno; - goto finish; + log_error("Failed to create symlink %s: %m", lnk); + return -errno; } } } @@ -366,109 +334,88 @@ 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) { - log_error("Out of memory"); - r = -ENOMEM; - goto finish; - } + if (!name) + return log_oom(); automount_unit = strjoin(arg_dest, "/", automount_name, NULL); - if (!automount_unit) { - log_error("Out of memory"); - r = -ENOMEM; - 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, "# Automatically generated by systemd-fstab-generator\n\n" "[Unit]\n" - "SourcePath=/etc/fstab\n" + "SourcePath=%s\n" "DefaultDependencies=no\n" "Conflicts=" SPECIAL_UMOUNT_TARGET "\n" - "Before=" SPECIAL_UMOUNT_TARGET " %s\n" - "\n" + "Before=" SPECIAL_UMOUNT_TARGET "\n", + source); + + if (post) + fprintf(f, + "Before= %s\n", + post); + + fprintf(f, "[Automount]\n" "Where=%s\n", - post, where); 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) { - log_error("Out of memory"); - r = -ENOMEM; - 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) { +static int parse_fstab(const char *prefix, bool initrd) { FILE *f; + _cleanup_free_ char *fstab_path = NULL; int r = 0; struct mntent *me; errno = 0; - f = setmntent("/etc/fstab", "r"); + fstab_path = strjoin(prefix, "/etc/fstab", NULL); + f = setmntent(fstab_path, "r"); if (!f) { if (errno == ENOENT) return 0; - log_error("Failed to open /etc/fstab: %m"); + log_error("Failed to open %s/etc/fstab: %m", prefix); return -errno; } 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) { - log_error("Out of memory"); - r = -ENOMEM; - goto finish; - } + if (initrd && !mount_in_initrd(me)) + continue; - where = strdup(me->mnt_dir); - if (!where) { - log_error("Out of memory"); - free(what); - r = -ENOMEM; + what = fstab_node_to_udev_node(me->mnt_fsname); + where = strjoin(prefix, me->mnt_dir, NULL); + if (!what || !where) { + r = log_oom(); goto finish; } @@ -479,11 +426,35 @@ static int parse_fstab(void) { if (streq(me->mnt_type, "swap")) k = add_swap(what, me); - else - k = add_mount(what, where, me); + else { + bool noauto, nofail, automount, isbind; + const char *pre, *post; + + noauto = !!hasmntopt(me, "noauto"); + nofail = !!hasmntopt(me, "nofail"); + automount = + hasmntopt(me, "comment=systemd.automount") || + hasmntopt(me, "x-systemd.automount"); + isbind = mount_is_bind(me); + + if (initrd) { + post = SPECIAL_INITRD_FS_TARGET; + pre = NULL; + } else if (mount_is_rootfs(me)) { + post = SPECIAL_INITRD_ROOT_FS_TARGET; + pre = NULL; + } else if (mount_is_network(me)) { + post = SPECIAL_REMOTE_FS_TARGET; + pre = SPECIAL_REMOTE_FS_PRE_TARGET; + } else { + post = SPECIAL_LOCAL_FS_TARGET; + pre = SPECIAL_LOCAL_FS_PRE_TARGET; + } - free(what); - free(where); + k = add_mount(what, where, me->mnt_type, me->mnt_opts, + me->mnt_passno, noauto, nofail, automount, + isbind, pre, post, fstab_path); + } if (k < 0) r = k; @@ -494,8 +465,83 @@ 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; + + 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("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) { + 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(); + + } + + free(word); + } + + if (!what) { + log_error("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); + return 0; + } + + log_debug("Found entry what=%s where=/sysroot type=%s", what, type); + r = add_mount(what, "/sysroot", type, opts, 0, false, false, false, + false, NULL, SPECIAL_INITRD_ROOT_FS_TARGET, "/proc/cmdline"); + + return (r < 0) ? r : 0; +} + static int parse_proc_cmdline(void) { - char *line, *w, *state; + char _cleanup_free_ *line = NULL; + char *w, *state; int r; size_t l; @@ -509,13 +555,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 = -ENOMEM; - goto finish; - } + if (!word) + return log_oom(); if (startswith(word, "fstab=")) { r = parse_boolean(word + 6); @@ -539,19 +583,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 = 0, k, l = 0; if (argc > 1 && argc != 4) { log_error("This program takes three or no arguments."); @@ -570,10 +608,16 @@ int main(int argc, char *argv[]) { if (parse_proc_cmdline() < 0) return EXIT_FAILURE; + if (in_initrd()) + r = parse_new_root_from_proc_cmdline(); + if (!arg_enabled) - return EXIT_SUCCESS; + return (r < 0) ? EXIT_FAILURE : EXIT_SUCCESS; + + k = parse_fstab("", false); - r = parse_fstab(); + if (in_initrd()) + l = parse_fstab("/sysroot", true); - return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; + return (r < 0) || (k < 0) || (l < 0) ? EXIT_FAILURE : EXIT_SUCCESS; }