wok-6.x rev 13412

busybox: fix blkid swap detection
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Oct 01 15:09:52 2012 +0200 (2012-10-01)
parents 3957e60d6239
children 8961a528c31d
files busybox/receipt busybox/stuff/busybox-1.20-blkid-swap.u
line diff
     1.1 --- a/busybox/receipt	Mon Oct 01 10:08:31 2012 +0200
     1.2 +++ b/busybox/receipt	Mon Oct 01 15:09:52 2012 +0200
     1.3 @@ -40,6 +40,7 @@
     1.4  cmdline.u
     1.5  su-nochdir.u
     1.6  diff.u
     1.7 +blkid-swap.u
     1.8  EOT
     1.9      cp $stuff/$PACKAGE-${VERSION%.*}.config .config
    1.10  }
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/busybox/stuff/busybox-1.20-blkid-swap.u	Mon Oct 01 15:09:52 2012 +0200
     2.3 @@ -0,0 +1,10 @@
     2.4 +Swap partitions may have neither label nor uuid
     2.5 +--- busybox-1.20.0/util-linux/volume_id/get_devname.c
     2.6 ++++ busybox-1.20.0/util-linux/volume_id/get_devname.c
     2.7 +@@ -50,5 +50,5 @@
     2.8 + 		goto ret;
     2.9 + 
    2.10 +-	if (vid->label[0] != '\0' || vid->uuid[0] != '\0') {
    2.11 ++	if (vid->type) {
    2.12 + 		*label = xstrndup(vid->label, sizeof(vid->label));
    2.13 + 		*uuid  = xstrndup(vid->uuid, sizeof(vid->uuid));