summaryrefslogtreecommitdiffstats
path: root/mount/swapon.c
diff options
context:
space:
mode:
authorKarel Zak2010-11-29 10:26:18 +0100
committerKarel Zak2010-11-30 10:12:00 +0100
commit5a16af58c5b3625e6e5a1a487bdf5521cb9646c2 (patch)
treec03393f746de6b86e241da5c9479f9179cb8a063 /mount/swapon.c
parentfdisk: fix freespace boundaries calculation on SGI disklabel (diff)
downloadkernel-qcow2-util-linux-5a16af58c5b3625e6e5a1a487bdf5521cb9646c2.tar.gz
kernel-qcow2-util-linux-5a16af58c5b3625e6e5a1a487bdf5521cb9646c2.tar.xz
kernel-qcow2-util-linux-5a16af58c5b3625e6e5a1a487bdf5521cb9646c2.zip
libblkid: add LINHIB0001 signature to swap prober
The new swsuspend signature has been added by commit 3624eb04c24861ab296842414f9752a393e68372 to kernel 2.6.37-rc1. Reported-by: "Dr. David Alan Gilbert" <linux@treblig.org> Addresses: https://bugs.launchpad.net/ubuntu/+source/util-linux/+bug/682176 Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'mount/swapon.c')
-rw-r--r--mount/swapon.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mount/swapon.c b/mount/swapon.c
index d8fad0bfa..a2dd9dc26 100644
--- a/mount/swapon.c
+++ b/mount/swapon.c
@@ -298,7 +298,8 @@ swap_detect_signature(const char *buf, int *sig)
else if (memcmp(buf, "S1SUSPEND", 9) == 0 ||
memcmp(buf, "S2SUSPEND", 9) == 0 ||
memcmp(buf, "ULSUSPEND", 9) == 0 ||
- memcmp(buf, "\xed\xc3\x02\xe9\x98\x56\xe5\x0c", 8) == 0)
+ memcmp(buf, "\xed\xc3\x02\xe9\x98\x56\xe5\x0c", 8) == 0 ||
+ memcmp(buf, "LINHIB0001", 10) == 0)
*sig = SIG_SWSUSPEND;
else
return 0;