# HG changeset patch # User Pascal Bellard # Date 1349096992 -7200 # Node ID 1ca52b3246f29fbb256d36ca666da1b5d32149fc # Parent 3957e60d62399dc26d69406109144b3d8b3df6a1 busybox: fix blkid swap detection diff -r 3957e60d6239 -r 1ca52b3246f2 busybox/receipt --- a/busybox/receipt Mon Oct 01 10:08:31 2012 +0200 +++ b/busybox/receipt Mon Oct 01 15:09:52 2012 +0200 @@ -40,6 +40,7 @@ cmdline.u su-nochdir.u diff.u +blkid-swap.u EOT cp $stuff/$PACKAGE-${VERSION%.*}.config .config } diff -r 3957e60d6239 -r 1ca52b3246f2 busybox/stuff/busybox-1.20-blkid-swap.u --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/busybox/stuff/busybox-1.20-blkid-swap.u Mon Oct 01 15:09:52 2012 +0200 @@ -0,0 +1,10 @@ +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; + +- if (vid->label[0] != '\0' || vid->uuid[0] != '\0') { ++ if (vid->type) { + *label = xstrndup(vid->label, sizeof(vid->label)); + *uuid = xstrndup(vid->uuid, sizeof(vid->uuid));