fstab-generator: initrd - mount selected entries from /sysroot/etc/fstab

We only mount "/usr" and entries marked with "x-initrd.mount".

This (together with the right unit files) is needed in the initramfs in order to
natively support mounting /usr (and friends) from the initramfs.

The way it is meant to work is:
 * wait for sysroot.mount to be mounted
 * do a daemon-reload to generate sysroot-usr.mount (++) from /sysroot/etc/fstab
 * wait for sysroot-usr.mount to be mounted
 * switch-root

Cc: Harald Hoyer <harald.hoyer@gmail.com>
Cc: Dave Reisner <d@falconindy.com>

1 files changed, 28 insertions, 11 deletions

diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index 23a8d7981..1a1fe8605 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -188,12 +188,20 @@ static bool mount_is_network(struct mntent *me) {
 
         return
                 hasmntopt(me, "_netdev") ||
                 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 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, bool isnetwork,
                      const char *source) {
         char _cleanup_free_
                 *name = NULL, *unit = NULL, *lnk = NULL, *device = NULL,
                 *automount_name = NULL, *automount_unit = NULL;
@@ -339,19 +347,20 @@ static int add_mount(const char *what, const char *where, const char *type, cons
                         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"
                         "[Automount]\n"
                         "Where=%s\n",
+                        source,
                         post,
                         where);
 
                 fflush(f);
                 if (ferror(f)) {
                         log_error("Failed to write unit file %s: %m", automount_unit);
@@ -370,33 +379,38 @@ 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;
         }
 
         while ((me = getmntent(f))) {
                 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;
                 }
 
                 if (is_path(where))
@@ -416,13 +430,13 @@ static int parse_fstab(void) {
                                   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, noauto, nofail, automount,
-                                     isbind, isnetwork, "/etc/fstab");
+                                     isbind, isnetwork, fstab_path);
                 }
 
                 if (k < 0)
                         r = k;
         }
 
@@ -549,13 +563,13 @@ static int parse_proc_cmdline(void) {
         }
 
         return 0;
 }
 
 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.");
                 return EXIT_FAILURE;
         }
 
@@ -569,15 +583,18 @@ int main(int argc, char *argv[]) {
         umask(0022);
 
         if (parse_proc_cmdline() < 0)
                 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;
 
-        r = parse_fstab();
+        k = parse_fstab("", false);
+
+        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;
 }