[git commit master] volume_id/linux_swap: detect suspended image signatures too
Denys Vlasenko
vda.linux at googlemail.com
Mon Feb 8 02:08:05 UTC 2010
commit: http://git.busybox.net/busybox/commit/?id=73ccd0ca879b3b3958fc15fad9565aa97ee04884
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master
Signed-off-by: Vladimir Dronnikov <dronnikov at gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
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 1b5488f..5743546 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*/)
goto found;
}
- if (memcmp(buf, "SWAPSPACE2", 10) == 0) {
+ if (memcmp(buf, "SWAPSPACE2", 10) == 0
+ || memcmp(buf, "S1SUSPEND", 9) == 0
+ || memcmp(buf, "S2SUSPEND", 9) == 0
+ || memcmp(buf, "ULSUSPEND", 9) == 0
+ ) {
sw = volume_id_get_buffer(id, off, sizeof(struct swap_header_v1_2));
if (sw == NULL)
return -1;
--
1.6.3.3
More information about the busybox-cvs
mailing list