swaponoff: add uuid/label support. By Natanael Copa

function                                             old     new   delta
swap_enable_disable                                  130     150     +20
resolve_mount_spec                                    76      96     +20
mount_main                                          1152    1154      +2
findfs_main                                          125      80     -45
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/1 up/down: 42/-45)             Total: -3 bytes

Signed-off-by: Natanael Copa <natanael.copa@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

1 files changed, 17 insertions, 0 deletions

diff --git a/util-linux/volume_id/get_devname.c b/util-linux/volume_id/get_devname.c
index 0686a0741..9b5283f87 100644
--- a/util-linux/volume_id/get_devname.c
+++ b/util-linux/volume_id/get_devname.c
@@ -260,3 +260,20 @@ char *get_devname_from_uuid(const char *spec)
         }
         return NULL;
 }
+
+int resolve_mount_spec(char **fsname)
+{
+        char *tmp = *fsname;
+
+        if (strncmp(*fsname, "UUID=", 5) == 0)
+                tmp = get_devname_from_uuid(*fsname + 5);
+        else if (strncmp(*fsname, "LABEL=", 6) == 0)
+                tmp = get_devname_from_label(*fsname + 6);
+
+        if (tmp == *fsname)
+                return 0; /* no UUID= or LABEL= prefix found */
+
+        if (tmp)
+                *fsname = tmp;
+        return 1;
+}