summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard W.M. Jones2011-06-13 18:43:11 +0200
committerKarel Zak2011-06-14 17:08:59 +0200
commit55c22e9c82ae7e5d7e916480d0606bb3a414236b (patch)
tree8b527b3a2510a697048f98a9e8f0fc623c6c27ae
parentmkfs.minix: add fs version options (diff)
downloadkernel-qcow2-util-linux-55c22e9c82ae7e5d7e916480d0606bb3a414236b.tar.gz
kernel-qcow2-util-linux-55c22e9c82ae7e5d7e916480d0606bb3a414236b.tar.xz
kernel-qcow2-util-linux-55c22e9c82ae7e5d7e916480d0606bb3a414236b.zip
libblkid: don't ignore swap UUID if only first byte is zero
[kzak@redhat.com: - remove memcmp(zero_uuid, ...), library already checks for empty UUIDs] Signed-off-by: "Richard W.M. Jones" <rjones@redhat.com> Signed-off-by: Karel Zak <kzak@redhat.com>
-rw-r--r--libblkid/src/superblocks/swap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libblkid/src/superblocks/swap.c b/libblkid/src/superblocks/swap.c
index 325a8fafa..7ac119bed 100644
--- a/libblkid/src/superblocks/swap.c
+++ b/libblkid/src/superblocks/swap.c
@@ -56,7 +56,7 @@ static int swap_set_info(blkid_probe pr, const char *version)
if (hdr->volume[0] && blkid_probe_set_label(pr, hdr->volume,
sizeof(hdr->volume)) < 0)
return -1;
- if (hdr->uuid[0] && blkid_probe_set_uuid(pr, hdr->uuid) < 0)
+ if (blkid_probe_set_uuid(pr, hdr->uuid) < 0)
return -1;
}