X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ffstab-generator%2Ffstab-generator.c;h=1a1fe8605f69a573a60e440351f1ace267bf05ae;hb=3d22d1ab57bf44c92e4d9ca95d9728105dd3fb0d;hp=9db4123530096f5d3be656d7f4ba22a75026234f;hpb=3f8ee7918207d7128d4edbc20a1e81f4c6e1110e;p=elogind.git

diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index 9db412353..1a1fe8605 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -191,8 +191,16 @@ 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 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,
+                     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,
@@ -284,10 +292,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);
@@ -346,13 +350,14 @@ 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"
                         "[Automount]\n"
                         "Where=%s\n",
+                        source,
                         post,
                         where);
 
@@ -377,18 +382,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 +403,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;
@@ -422,9 +432,8 @@ static int parse_fstab(void) {
                         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");
+                                     me->mnt_passno, noauto, nofail, automount,
+                                     isbind, isnetwork, fstab_path);
                 }
 
                 if (k < 0)
@@ -441,7 +450,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 +457,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,8 +497,7 @@ static int parse_new_root_from_proc_cmdline(void) {
                         if (!opts)
                                 return log_oom();
 
-                } else if (streq(word, "rootwait"))
-                        wait = true;
+                }
 
                 free(word);
         }
@@ -498,8 +505,8 @@ static int parse_new_root_from_proc_cmdline(void) {
         if (what) {
 
                 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");
+                r = add_mount(what, "/sysroot", type, opts, 0, false, false, false,
+                              false, false, "/proc/cmdline");
 
                 if (r < 0)
                         return r;
@@ -559,7 +566,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 +586,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;
 
-        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;
 }