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=9db4123530096f5d3be656d7f4ba22a75026234f;hb=790838e4f16831f2bb06aeb845b9e2fb0f1d28dd;hpb=3f8ee7918207d7128d4edbc20a1e81f4c6e1110e diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c index 9db412353..d5f9db49c 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.c @@ -191,15 +191,28 @@ static bool mount_is_network(struct mntent *me) { fstype_is_network(me->mnt_type); } +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 wait, bool noauto, bool nofail, bool automount, bool isbind, bool isnetwork, - const char *source) { + 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); @@ -219,14 +232,6 @@ static int add_mount(const char *what, const char *where, const char *type, cons mount_point_ignore(where)) return 0; - 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) return log_oom(); @@ -251,17 +256,19 @@ static int add_mount(const char *what, const char *where, const char *type, cons "DefaultDependencies=no\n", source); - if (!path_equal(where, "/")) + 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); @@ -284,10 +291,6 @@ static int add_mount(const char *what, const char *where, const char *type, cons "Options=%s\n", opts); - if (wait) - fprintf(f, - "TimeoutSec=0\n"); - fflush(f); if (ferror(f)) { log_error("Failed to write unit file %s: %m", unit); @@ -295,14 +298,16 @@ static int add_mount(const char *what, const char *where, const char *type, cons } if (!noauto) { - lnk = strjoin(arg_dest, "/", post, nofail || automount ? ".wants/" : ".requires/", name, NULL); - if (!lnk) - return log_oom(); + 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; + mkdir_parents_label(lnk, 0755); + if (symlink(unit, lnk) < 0) { + log_error("Failed to create symlink %s: %m", lnk); + return -errno; + } } if (!isbind && @@ -346,14 +351,20 @@ static int add_mount(const char *what, const char *where, const char *type, cons 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); @@ -377,18 +388,20 @@ static int add_mount(const char *what, const char *where, const char *type, cons 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; } @@ -396,8 +409,11 @@ static int parse_fstab(void) { char _cleanup_free_ *where = NULL, *what = NULL; int k; + if (initrd && !mount_in_initrd(me)) + continue; + what = fstab_node_to_udev_node(me->mnt_fsname); - where = strdup(me->mnt_dir); + where = strjoin(prefix, me->mnt_dir, NULL); if (!what || !where) { r = log_oom(); goto finish; @@ -411,7 +427,8 @@ static int parse_fstab(void) { if (streq(me->mnt_type, "swap")) k = add_swap(what, me); else { - bool noauto, nofail, automount, isbind, isnetwork; + bool noauto, nofail, automount, isbind; + const char *pre, *post; noauto = !!hasmntopt(me, "noauto"); nofail = !!hasmntopt(me, "nofail"); @@ -419,12 +436,24 @@ static int parse_fstab(void) { hasmntopt(me, "comment=systemd.automount") || hasmntopt(me, "x-systemd.automount"); isbind = mount_is_bind(me); - isnetwork = mount_is_network(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; + } k = add_mount(what, where, me->mnt_type, me->mnt_opts, - me->mnt_passno, false, noauto, nofail, - automount, isbind, isnetwork, - "/etc/fstab"); + me->mnt_passno, noauto, nofail, automount, + isbind, pre, post, fstab_path); } if (k < 0) @@ -441,7 +470,6 @@ static int parse_new_root_from_proc_cmdline(void) { _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) { @@ -449,7 +477,7 @@ static int parse_new_root_from_proc_cmdline(void) { return 0; } - opts = strdup("defaults"); + opts = strdup("ro"); type = strdup("auto"); if (!opts || !type) return log_oom(); @@ -489,24 +517,26 @@ static int parse_new_root_from_proc_cmdline(void) { if (!opts) return log_oom(); - } else if (streq(word, "rootwait")) - wait = true; + } free(word); } - if (what) { + if (!what) { + log_error("Could not find a root= entry on the kernel commandline."); + return 0; + } - log_debug("Found entry what=%s where=/sysroot type=%s", what, type); - r = add_mount(what, "/sysroot", type, opts, 0, wait, false, false, - false, false, false, "/proc/cmdline"); + if (what[0] != '/') { + log_debug("Skipping entry what=%s where=/sysroot type=%s", what, type); + return 0; + } - if (r < 0) - return r; - } else - log_error("Could not find a root= entry on the kernel commandline."); + 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 0; + return (r < 0) ? r : 0; } static int parse_proc_cmdline(void) { @@ -559,7 +589,7 @@ static int parse_proc_cmdline(void) { } int main(int argc, char *argv[]) { - int r, k = 0; + int r = 0, k, l = 0; if (argc > 1 && argc != 4) { log_error("This program takes three or no arguments."); @@ -579,12 +609,15 @@ int main(int argc, char *argv[]) { return EXIT_FAILURE; if (in_initrd()) - k = parse_new_root_from_proc_cmdline(); + 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) || (k < 0) ? EXIT_FAILURE : EXIT_SUCCESS; + return (r < 0) || (k < 0) || (l < 0) ? EXIT_FAILURE : EXIT_SUCCESS; }