From 9aff29997ed22932f78aa8d8c7c2412e9d3f49e5 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Sun, 20 Sep 2009 04:28:22 +0200 Subject: 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 Signed-off-by: Denys Vlasenko --- util-linux/volume_id/get_devname.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'util-linux/volume_id') 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; +} -- cgit v1.2.3