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=6f392dfd4d9c994d50a201236df5681b0aea9cdc;hp=ba55f2c2b73d0ce09bbd59232b4cbbe54c94e998;hb=2968644080fd103062f070e83edd620e0a58c44d;hpb=67ab5f761f9b854d8ce85f9ee47b298e497f8bd9

diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index ba55f2c2b..6f392dfd4 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -32,26 +32,18 @@
 #include "mount-setup.h"
 #include "special.h"
 #include "mkdir.h"
+#include "fileio.h"
+#include "generator.h"
+#include "strv.h"
 #include "virt.h"
 
 static const char *arg_dest = "/tmp";
-static bool arg_enabled = true;
+static bool arg_fstab_enabled = true;
+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 int device_name(const char *path, char **unit) {
-        char *p;
-
-        assert(path);
-
-        if (!is_device_path(path))
-                return 0;
-
-        p = unit_name_from_path(path, ".device");
-        if (!p)
-                return log_oom();
-
-        *unit = p;
-        return 1;
-}
 
 static int mount_find_pri(struct mntent *me, int *ret) {
         char *end, *pri;
@@ -68,7 +60,7 @@ static int mount_find_pri(struct mntent *me, int *ret) {
 
         errno = 0;
         r = strtoul(pri, &end, 10);
-        if (errno != 0)
+        if (errno > 0)
                 return -errno;
 
         if (end == pri || (*end != ',' && *end != 0))
@@ -79,14 +71,19 @@ 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;
-        bool noauto, nofail;
+        _cleanup_free_ char *name = NULL, *unit = NULL, *lnk = NULL;
+        _cleanup_fclose_ FILE *f = 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");
@@ -94,42 +91,29 @@ static int add_swap(const char *what, struct mntent *me) {
         }
 
         noauto = !!hasmntopt(me, "noauto");
-        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;
                 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);
-                goto finish;
+                return -errno;
         }
 
-        fputs("# Automatically generated by systemd-fstab-generator\n\n"
-              "[Unit]\n"
-              "SourcePath=/etc/fstab\n"
-              "DefaultDependencies=no\n"
-              "Conflicts=" SPECIAL_UMOUNT_TARGET "\n"
-              "Before=" SPECIAL_UMOUNT_TARGET "\n", f);
-
-        if (!noauto && !nofail)
-                fputs("Before=" SPECIAL_SWAP_TARGET "\n", f);
-
         fprintf(f,
-                "\n"
+                "# Automatically generated by systemd-fstab-generator\n\n"
+                "[Unit]\n"
+                "SourcePath=/etc/fstab\n"
+                "Documentation=man:fstab(5) man:systemd-fstab-generator(8)\n\n"
                 "[Swap]\n"
                 "What=%s\n",
                 what);
@@ -142,56 +126,22 @@ static int add_swap(const char *what, struct mntent *me) {
         fflush(f);
         if (ferror(f)) {
                 log_error("Failed to write unit file %s: %m", unit);
-                r = -errno;
-                goto finish;
+                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 %s: %m", lnk);
-                        r = -errno;
-                        goto finish;
-                }
-
-                r = device_name(what, &device);
-                if (r < 0)
-                        goto finish;
-
-                if (r > 0) {
-                        free(lnk);
-                        lnk = strjoin(arg_dest, "/", device, ".wants/", name, NULL);
-                        if (!lnk) {
-                                r = log_oom();
-                                goto finish;
-                        }
-
-                        mkdir_parents_label(lnk, 0755);
-                        if (symlink(unit, lnk) < 0) {
-                                log_error("Failed to create symlink %s: %m", lnk);
-                                r = -errno;
-                                goto finish;
-                        }
+                        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_network(struct mntent *me) {
@@ -202,18 +152,39 @@ 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 int add_mount(
+                const char *what,
+                const char *where,
+                const char *fstype,
+                const char *opts,
+                int passno,
+                bool noauto,
+                bool nofail,
+                bool automount,
+                const char *post,
+                const char *source) {
+
+        _cleanup_free_ char
+                *name = NULL, *unit = NULL, *lnk = NULL,
+                *automount_name = NULL, *automount_unit = NULL,
+                *filtered = NULL;
+        _cleanup_fclose_ FILE *f = NULL;
         int r;
-        const char *post, *pre;
 
         assert(what);
         assert(where);
-        assert(me);
+        assert(opts);
+        assert(source);
 
-        if (streq(me->mnt_type, "autofs"))
+        if (streq_ptr(fstype, "autofs"))
                 return 0;
 
         if (!is_path(where)) {
@@ -225,232 +196,172 @@ 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 = !!hasmntopt(me, "bind");
-
-        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;
+        if (path_equal(where, "/")) {
+                /* The root disk is not an option */
+                automount = false;
+                noauto = false;
+                nofail = false;
         }
 
         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;
                 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);
-                goto finish;
+                return -errno;
         }
 
-        fputs("# Automatically generated by systemd-fstab-generator\n\n"
-              "[Unit]\n"
-              "SourcePath=/etc/fstab\n"
-              "DefaultDependencies=no\n", f);
-
-        if (!path_equal(where, "/"))
-                fprintf(f,
-                        "After=%s\n"
-                        "Wants=%s\n"
-                        "Conflicts=" SPECIAL_UMOUNT_TARGET "\n"
-                        "Before=" SPECIAL_UMOUNT_TARGET "\n",
-                        pre,
-                        pre);
+        fprintf(f,
+                "# Automatically generated by systemd-fstab-generator\n\n"
+                "[Unit]\n"
+                "SourcePath=%s\n"
+                "Documentation=man:fstab(5) man:systemd-fstab-generator(8)\n",
+                source);
 
+        if (post && !noauto && !nofail && !automount)
+                fprintf(f, "Before=%s\n", post);
 
-        if (!noauto && !nofail && !automount)
-                fprintf(f,
-                        "Before=%s\n",
-                        post);
+        if (passno != 0) {
+                r = generator_write_fsck_deps(f, arg_dest, what, where, fstype);
+                if (r < 0)
+                        return r;
+        }
 
         fprintf(f,
                 "\n"
                 "[Mount]\n"
                 "What=%s\n"
-                "Where=%s\n"
-                "Type=%s\n"
-                "FsckPassNo=%i\n",
+                "Where=%s\n",
                 what,
-                where,
-                me->mnt_type,
-                me->mnt_passno);
+                where);
 
-        if (!isempty(me->mnt_opts) &&
-            !streq(me->mnt_opts, "defaults"))
-                fprintf(f,
-                        "Options=%s\n",
-                        me->mnt_opts);
+        if (!isempty(fstype) && !streq(fstype, "auto"))
+                fprintf(f, "Type=%s\n", fstype);
+
+        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)) {
                 log_error("Failed to write unit file %s: %m", unit);
-                r = -errno;
-                goto finish;
+                return -errno;
         }
 
-        if (!noauto) {
+        if (!noauto && post) {
                 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 %s: %m", lnk);
-                        r = -errno;
-                        goto finish;
-                }
-
-                if (!isbind &&
-                    !path_equal(where, "/")) {
-
-                        r = device_name(what, &device);
-                        if (r < 0)
-                                goto finish;
-
-                        if (r > 0) {
-                                free(lnk);
-                                lnk = strjoin(arg_dest, "/", device, ".wants/", name, NULL);
-                                if (!lnk) {
-                                        r = log_oom();
-                                        goto finish;
-                                }
-
-                                mkdir_parents_label(lnk, 0755);
-                                if (symlink(unit, lnk) < 0) {
-                                        log_error("Failed to create symlink %s: %m", lnk);
-                                        r = -errno;
-                                        goto finish;
-                                }
-                        }
+                        return -errno;
                 }
         }
 
-        if (automount && !path_equal(where, "/")) {
+        if (automount) {
                 automount_name = unit_name_from_path(where, ".automount");
-                if (!name) {
-                        r = log_oom();
-                        goto finish;
-                }
+                if (!automount_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 %s: %m", automount_unit);
-                        goto finish;
+                        return -errno;
                 }
 
                 fprintf(f,
                         "# Automatically generated by systemd-fstab-generator\n\n"
                         "[Unit]\n"
-                        "SourcePath=/etc/fstab\n"
-                        "DefaultDependencies=no\n"
-                        "Conflicts=" SPECIAL_UMOUNT_TARGET "\n"
-                        "Before=" SPECIAL_UMOUNT_TARGET " %s\n"
-                        "\n"
+                        "SourcePath=%s\n"
+                        "Documentation=man:fstab(5) man:systemd-fstab-generator(8)\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 %s: %m", automount_unit);
-                        r = -errno;
-                        goto finish;
+                        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 %s: %m", lnk);
-                        r = -errno;
-                        goto finish;
+                        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) {
-        FILE *f;
-        int r = 0;
+static int parse_fstab(bool initrd) {
+        _cleanup_endmntent_ FILE *f = NULL;
+        const char *fstab_path;
         struct mntent *me;
+        int r = 0;
 
-        errno = 0;
-        f = setmntent("/etc/fstab", "r");
+        fstab_path = initrd ? "/sysroot/etc/fstab" : "/etc/fstab";
+        f = setmntent(fstab_path, "re");
         if (!f) {
                 if (errno == ENOENT)
                         return 0;
 
-                log_error("Failed to open /etc/fstab: %m");
+                log_error("Failed to open %s: %m", fstab_path);
                 return -errno;
         }
 
         while ((me = getmntent(f))) {
-                char *where, *what;
+                _cleanup_free_ char *where = NULL, *what = NULL;
                 int k;
 
+                if (initrd && !mount_in_initrd(me))
+                        continue;
+
                 what = fstab_node_to_udev_node(me->mnt_fsname);
-                if (!what) {
-                        r = log_oom();
-                        goto finish;
-                }
+                if (!what)
+                        return log_oom();
 
-                where = strdup(me->mnt_dir);
-                if (!where) {
-                        r = log_oom();
-                        free(what);
-                        goto finish;
+                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();
+
                 if (is_path(where))
                         path_kill_slashes(where);
 
@@ -458,79 +369,132 @@ 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;
+                        const char *post;
+
+                        noauto = !!hasmntopt(me, "noauto");
+                        nofail = !!hasmntopt(me, "nofail");
+                        automount =
+                                  hasmntopt(me, "comment=systemd.automount") ||
+                                  hasmntopt(me, "x-systemd.automount");
+
+                        if (initrd)
+                                post = SPECIAL_INITRD_FS_TARGET;
+                        else if (mount_in_initrd(me))
+                                post = SPECIAL_INITRD_ROOT_FS_TARGET;
+                        else if (mount_is_network(me))
+                                post = SPECIAL_REMOTE_FS_TARGET;
+                        else
+                                post = SPECIAL_LOCAL_FS_TARGET;
+
+                        k = add_mount(what,
+                                      where,
+                                      me->mnt_type,
+                                      me->mnt_opts,
+                                      me->mnt_passno,
+                                      noauto,
+                                      nofail,
+                                      automount,
+                                      post,
+                                      fstab_path);
+                }
 
                 if (k < 0)
                         r = k;
         }
 
-finish:
-        endmntent(f);
         return r;
 }
 
-static int parse_proc_cmdline(void) {
-        char *line, *w, *state;
-        int r;
-        size_t l;
+static int add_root_mount(void) {
+        _cleanup_free_ char *what = NULL;
+        const char *opts;
 
-        if (detect_container(NULL) > 0)
+        if (isempty(arg_root_what)) {
+                log_debug("Could not find a root= entry on the kernel commandline.");
                 return 0;
+        }
 
-        r = read_one_line_file("/proc/cmdline", &line);
-        if (r < 0) {
-                log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
+        what = fstab_node_to_udev_node(arg_root_what);
+        if (!path_is_absolute(what)) {
+                log_debug("Skipping entry what=%s where=/sysroot type=%s", what, strna(arg_root_fstype));
                 return 0;
         }
 
-        FOREACH_WORD_QUOTED(w, l, line, state) {
-                char *word;
+        if (!arg_root_options)
+                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 = strappenda3(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,
+                         opts,
+                         1,
+                         false,
+                         false,
+                         false,
+                         SPECIAL_INITRD_ROOT_FS_TARGET,
+                         "/proc/cmdline");
+}
 
-                word = strndup(w, l);
-                if (!word) {
-                        r = log_oom();
-                        goto finish;
-                }
+static int parse_proc_cmdline_item(const char *key, const char *value) {
+        int r;
 
-                if (startswith(word, "fstab=")) {
-                        r = parse_boolean(word + 6);
-                        if (r < 0)
-                                log_warning("Failed to parse fstab switch %s. Ignoring.", word + 6);
-                        else
-                                arg_enabled = 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 */
 
-                } else if (startswith(word, "rd.fstab=")) {
+        if (STR_IN_SET(key, "fstab", "rd.fstab") && value) {
 
-                        if (in_initrd()) {
-                                r = parse_boolean(word + 6);
-                                if (r < 0)
-                                        log_warning("Failed to parse fstab switch %s. Ignoring.", word + 6);
-                                else
-                                        arg_enabled = r;
-                        }
+                r = parse_boolean(value);
+                if (r < 0)
+                        log_warning("Failed to parse fstab switch %s. Ignoring.", value);
+                else
+                        arg_fstab_enabled = r;
 
-                } else if (startswith(word, "fstab.") ||
-                           (in_initrd() && startswith(word, "rd.fstab."))) {
+        } else if (streq(key, "root") && value) {
 
-                        log_warning("Unknown kernel switch %s. Ignoring.", word);
-                }
+                free(arg_root_what);
+                arg_root_what = strdup(value);
+                if (!arg_root_what)
+                        return log_oom();
 
-                free(word);
-        }
+        } else if (streq(key, "rootfstype") && value) {
 
-        r = 0;
+                free(arg_root_fstype);
+                arg_root_fstype = strdup(value);
+                if (!arg_root_fstype)
+                        return log_oom();
 
-finish:
-        free(line);
-        return r;
+        } else if (streq(key, "rootflags") && value) {
+                char *o;
+
+                o = arg_root_options ?
+                        strjoin(arg_root_options, ",", value, NULL) :
+                        strdup(value);
+                if (!o)
+                        return log_oom();
+
+                free(arg_root_options);
+                arg_root_options = o;
+
+        } else if (streq(key, "rw") && !value)
+                arg_root_rw = true;
+        else if (streq(key, "ro") && !value)
+                arg_root_rw = false;
+
+        return 0;
 }
 
 int main(int argc, char *argv[]) {
-        int r;
+        int r = 0;
 
         if (argc > 1 && argc != 4) {
                 log_error("This program takes three or no arguments.");
@@ -546,13 +510,33 @@ int main(int argc, char *argv[]) {
 
         umask(0022);
 
-        if (parse_proc_cmdline() < 0)
+        if (parse_proc_cmdline(parse_proc_cmdline_item) < 0)
                 return EXIT_FAILURE;
 
-        if (!arg_enabled)
-                return EXIT_SUCCESS;
+        /* Always honour root= in the kernel command line if we are in an initrd */
+        if (in_initrd())
+                r = add_root_mount();
+
+        /* Honour /etc/fstab only when that's enabled */
+        if (arg_fstab_enabled) {
+                int k;
+
+                log_debug("Parsing /etc/fstab");
 
-        r = parse_fstab();
+                /* Parse the local /etc/fstab, possibly from the initrd */
+                k = parse_fstab(false);
+                if (k < 0)
+                        r = k;
+
+                /* 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;
+                }
+        }
 
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }