# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1351673027 -3600
# Node ID 93f69b28570ebe0cb1a3068976d0c1c8bfc91883
# Parent  d53ecda155faf456b99fb3a340382452a27d8aa0
busybox/blkid-swap.u: do not rely on vid->type

diff -r d53ecda155fa -r 93f69b28570e busybox/stuff/busybox-1.20-blkid-swap.u
--- a/busybox/stuff/busybox-1.20-blkid-swap.u	Tue Oct 30 01:42:07 2012 +0000
+++ b/busybox/stuff/busybox-1.20-blkid-swap.u	Wed Oct 31 09:43:47 2012 +0100
@@ -1,10 +1,25 @@
 Swap partitions may have neither label nor uuid
 --- busybox-1.20.0/util-linux/volume_id/get_devname.c
 +++ busybox-1.20.0/util-linux/volume_id/get_devname.c
-@@ -50,5 +50,5 @@
- 		goto ret;
+@@ -46,10 +46,7 @@
+ 	if (ioctl(/*vid->*/fd, BLKGETSIZE64, &size) != 0)
+ 		size = 0;
  
+-	if (volume_id_probe_all(vid, /*0,*/ size) != 0)
+-		goto ret;
+-
 -	if (vid->label[0] != '\0' || vid->uuid[0] != '\0') {
-+	if (vid->type) {
++	if (volume_id_probe_all(vid, /*0,*/ size) == 0) {
  		*label = xstrndup(vid->label, sizeof(vid->label));
  		*uuid  = xstrndup(vid->uuid, sizeof(vid->uuid));
+ #if ENABLE_FEATURE_BLKID_TYPE
+--- busybox-1.20.0/util-linux/volume_id/volume_id.c
++++ busybox-1.20.0/util-linux/volume_id/volume_id.c
+@@ -192,6 +192,7 @@
+ 			goto ret;
+ 	}
+ 
++	id->error = 1;
+  ret:
+ 	volume_id_free_buffer(id);
+ 	return (- id->error); /* 0 or -1 */