fix _ vs - bug

[project/ubox.git] / block.c

diff --git a/block.c b/block.c
index 723c0f0..c9285d6 100644 (file)
--- a/block.c
+++ b/block.c
@@ -302,7 +302,13 @@ static int swap_add(struct uci_section *s)
                /* store complete swap path */
                if (tb[SWAP_DEVICE])
                        m->target = blobmsg_get_strdup(tb[SWAP_DEVICE]);
-               vlist_add(&mounts, &m->node, (m->uuid) ? (m->uuid) : (m->device));
+
+               if (m->uuid)
+                       vlist_add(&mounts, &m->node, m->uuid);
+               else if (m->label)
+                       vlist_add(&mounts, &m->node, m->label);
+               else if (m->device)
+                       vlist_add(&mounts, &m->node, m->device);
        }
 
        return 0;
@@ -957,6 +963,8 @@ static int main_mount(int argc, char **argv)
        list_for_each_entry(pr, &devices, list)
                mount_device(pr, 0);
 
+       handle_swapfiles(true);
+
        return 0;
 }