X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ffstab-generator%2Ffstab-generator.c;h=2790fc6e8e9b7ebe7a5456a73e06fcf2bda4963b;hb=d7607eac6318ae8ff1c00ef5705fd55a614cd495;hp=9754f3a69a76c9ebd7b511775635189e50ae7d83;hpb=1b036593b76614dd05942a78120c151161cccc0f;p=elogind.git

diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index 9754f3a69..2790fc6e8 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -69,7 +69,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))
@@ -199,15 +199,21 @@ static bool mount_in_initrd(struct mntent *me) {
                 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) {
+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 *pre2,
+                const char *online,
+                const char *post,
+                const char *source) {
         char _cleanup_free_
                 *name = NULL, *unit = NULL, *lnk = NULL, *device = NULL,
                 *automount_name = NULL, *automount_unit = NULL;
@@ -258,11 +264,22 @@ static int add_mount(const char *what, const char *where, const char *type, cons
 
         if (!path_equal(where, "/")) {
                 if (pre)
+                        fprintf(f,
+                                "After=%s\n",
+                                pre);
+
+                if (pre2)
+                        fprintf(f,
+                                "After=%s\n",
+                                pre2);
+
+                if (online)
                         fprintf(f,
                                 "After=%s\n"
                                 "Wants=%s\n",
-                                pre,
-                                pre);
+                                online,
+                                online);
+
                 fprintf(f,
                         "Conflicts=" SPECIAL_UMOUNT_TARGET "\n"
                         "Before=" SPECIAL_UMOUNT_TARGET "\n");
@@ -430,7 +447,7 @@ static int parse_fstab(const char *prefix, bool initrd) {
                         k = add_swap(what, me);
                 else {
                         bool noauto, nofail, automount, isbind;
-                        const char *pre, *post;
+                        const char *pre, *pre2, *post, *online;
 
                         noauto = !!hasmntopt(me, "noauto");
                         nofail = !!hasmntopt(me, "nofail");
@@ -440,22 +457,25 @@ static int parse_fstab(const char *prefix, bool initrd) {
                         isbind = mount_is_bind(me);
 
                         if (initrd) {
+                                pre = pre2 = online = NULL;
                                 post = SPECIAL_INITRD_FS_TARGET;
-                                pre = NULL;
-                        } else if (mount_is_rootfs(me)) {
+                        } else if (mount_in_initrd(me)) {
+                                pre = pre2 = online = NULL;
                                 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;
+                                pre2 = SPECIAL_NETWORK_TARGET;
+                                online = SPECIAL_NETWORK_ONLINE_TARGET;
+                                post = SPECIAL_REMOTE_FS_TARGET;
                         } else {
-                                post = SPECIAL_LOCAL_FS_TARGET;
                                 pre = SPECIAL_LOCAL_FS_PRE_TARGET;
+                                pre2 = online = NULL;
+                                post = SPECIAL_LOCAL_FS_TARGET;
                         }
 
                         k = add_mount(what, where, me->mnt_type, me->mnt_opts,
-                                     me->mnt_passno, noauto, nofail, automount,
-                                     isbind, pre, post, fstab_path);
+                                      me->mnt_passno, noauto, nofail, automount,
+                                      isbind, pre, pre2, online, post, fstab_path);
                 }
 
                 if (k < 0)
@@ -528,7 +548,7 @@ static int parse_new_root_from_proc_cmdline(void) {
         }
 
         if (!what) {
-                log_error("Could not find a root= entry on the kernel commandline.");
+                log_debug("Could not find a root= entry on the kernel commandline.");
                 return 0;
         }
 
@@ -539,7 +559,7 @@ static int parse_new_root_from_proc_cmdline(void) {
 
         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");
+                      false, NULL, NULL, NULL, SPECIAL_INITRD_ROOT_FS_TARGET, "/proc/cmdline");
 
         return (r < 0) ? r : 0;
 }