diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-03-28 20:01:31 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-03-28 20:01:31 +0200 |
commit | 58cdca3984beb4e1019ef5ccf1dd7361f032a9a6 (patch) | |
tree | 922928fdb79cbdb6a02ffbeab7948c03ad501656 /util-linux/volume_id | |
parent | e52b735231bda70d811e4f9ef0e21fb2c7af96a2 (diff) | |
download | busybox-w32-1_16_1.tar.gz busybox-w32-1_16_1.tar.bz2 busybox-w32-1_16_1.zip |
apply post-1.16.0 fixes, bump version to 1.16.11_16_1
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'util-linux/volume_id')
-rw-r--r-- | util-linux/volume_id/linux_swap.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/util-linux/volume_id/linux_swap.c b/util-linux/volume_id/linux_swap.c index 1b5488f9e..574354611 100644 --- a/util-linux/volume_id/linux_swap.c +++ b/util-linux/volume_id/linux_swap.c | |||
@@ -52,7 +52,11 @@ int FAST_FUNC volume_id_probe_linux_swap(struct volume_id *id /*,uint64_t off*/) | |||
52 | goto found; | 52 | goto found; |
53 | } | 53 | } |
54 | 54 | ||
55 | if (memcmp(buf, "SWAPSPACE2", 10) == 0) { | 55 | if (memcmp(buf, "SWAPSPACE2", 10) == 0 |
56 | || memcmp(buf, "S1SUSPEND", 9) == 0 | ||
57 | || memcmp(buf, "S2SUSPEND", 9) == 0 | ||
58 | || memcmp(buf, "ULSUSPEND", 9) == 0 | ||
59 | ) { | ||
56 | sw = volume_id_get_buffer(id, off, sizeof(struct swap_header_v1_2)); | 60 | sw = volume_id_get_buffer(id, off, sizeof(struct swap_header_v1_2)); |
57 | if (sw == NULL) | 61 | if (sw == NULL) |
58 | return -1; | 62 | return -1; |