From: Karel Zak <kzak@redhat.com>
Date: Wed, 11 Sep 2013 08:40:13 +0000 (+0200)
Subject: libblkid: rename UUID_LOG to LOGUUID
X-Git-Tag: v2.24-rc1~289
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c57e6f5208cf62d6a7ca24ff332469eb0d5f539b;p=thirdparty%2Futil-linux.git

libblkid: rename UUID_LOG to LOGUUID

 * the goal is to make the uuid visible and usable it as mount
   variable/spec, then LOGUUID= seems better than UUID_LOG=

 * we already have PARTUUID=

 * the UUID_RAW and UUID_SUB are not used by mount(8)

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libblkid/src/superblocks/superblocks.c b/libblkid/src/superblocks/superblocks.c
index c09d8285fc..d5478551fe 100644
--- a/libblkid/src/superblocks/superblocks.c
+++ b/libblkid/src/superblocks/superblocks.c
@@ -49,7 +49,7 @@
  *
  * @UUID_SUB: subvolume uuid (e.g. btrfs)
  *
- * @UUID_LOG: external log UUID (e.g. xfs)
+ * @LOGUUID: external log UUID (e.g. xfs)
  *
  * @UUID_RAW: raw UUID from FS superblock
  *
diff --git a/libblkid/src/superblocks/xfs.c b/libblkid/src/superblocks/xfs.c
index 285b7c4a2e..7c514e8ddc 100644
--- a/libblkid/src/superblocks/xfs.c
+++ b/libblkid/src/superblocks/xfs.c
@@ -131,7 +131,7 @@ static int probe_xfs_log(blkid_probe pr, const struct blkid_idmag *mag)
 
 		if (xlog_valid_rec_header(rhead)) {
 			blkid_probe_set_uuid(pr, rhead->h_uuid);
-			blkid_probe_set_uuid_as(pr, rhead->h_uuid, "UUID_LOG");
+			blkid_probe_set_uuid_as(pr, rhead->h_uuid, "LOGUUID");
 			return 0;
 		}
 	}