git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
inspector: Update documentation to cover <icon> element.
[libguestfs.git]
/
daemon
/
blkid.c
diff --git
a/daemon/blkid.c
b/daemon/blkid.c
index
a619730
..
2885a8f
100644
(file)
--- a/
daemon/blkid.c
+++ b/
daemon/blkid.c
@@
-38,7
+38,8
@@
get_blkid_tag (const char *device, const char *tag)
* supposed to do this, but (a) it doesn't work and (b) that option
* is not supported in RHEL 5.
*/
* supposed to do this, but (a) it doesn't work and (b) that option
* is not supported in RHEL 5.
*/
- unlink ("/etc/blkid/blkid.tab");
+ unlink ("/etc/blkid/blkid.tab"); /* Red Hat, Fedora */
+ unlink ("/etc/blkid.tab"); /* Debian */
r = command (&out, &err,
"blkid", "-o", "value", "-s", tag, device, NULL);
r = command (&out, &err,
"blkid", "-o", "value", "-s", tag, device, NULL);
@@
-64,3
+65,15
@@
do_vfs_type (const char *device)
{
return get_blkid_tag (device, "TYPE");
}
{
return get_blkid_tag (device, "TYPE");
}
+
+char *
+do_vfs_label (const char *device)
+{
+ return get_blkid_tag (device, "LABEL");
+}
+
+char *
+do_vfs_uuid (const char *device)
+{
+ return get_blkid_tag (device, "UUID");
+}