blkid: Add support for detecting user-level suspend as a swsuspend signature

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/lib/blkid/probe.c b/lib/blkid/probe.c
index 68cc966f5c3c83938bb4d968274eb6d6eb9e5056..17feb9dfd006fe2b01627e1b57bec79bcaa586d5 100644 (file)
--- a/lib/blkid/probe.c
+++ b/lib/blkid/probe.c
@@ -1374,22 +1374,27 @@ static struct blkid_magic type_array[] = {
   { "swap",     0,  0xff6, 10, "SWAPSPACE2",           probe_swap1 },
   { "swsuspend", 0,  0xff6,  9, "S1SUSPEND",           probe_swap1 },
   { "swsuspend", 0,  0xff6,  9, "S2SUSPEND",           probe_swap1 },
+  { "swsuspend", 0,  0xff6,  9, "ULSUSPEND",           probe_swap1 },
   { "swap",     0, 0x1ff6, 10, "SWAP-SPACE",           probe_swap0 },
   { "swap",     0, 0x1ff6, 10, "SWAPSPACE2",           probe_swap1 },
   { "swsuspend", 0, 0x1ff6,  9, "S1SUSPEND",           probe_swap1 },
   { "swsuspend", 0, 0x1ff6,  9, "S2SUSPEND",           probe_swap1 },
+  { "swsuspend", 0, 0x1ff6,  9, "ULSUSPEND",           probe_swap1 },
   { "swap",     0, 0x3ff6, 10, "SWAP-SPACE",           probe_swap0 },
   { "swap",     0, 0x3ff6, 10, "SWAPSPACE2",           probe_swap1 },
   { "swsuspend", 0, 0x3ff6,  9, "S1SUSPEND",           probe_swap1 },
   { "swsuspend", 0, 0x3ff6,  9, "S2SUSPEND",           probe_swap1 },
+  { "swsuspend", 0, 0x3ff6,  9, "ULSUSPEND",           probe_swap1 },
   { "swap",     0, 0x7ff6, 10, "SWAP-SPACE",           probe_swap0 },
   { "swap",     0, 0x7ff6, 10, "SWAPSPACE2",           probe_swap1 },
   { "swsuspend", 0, 0x7ff6,  9, "S1SUSPEND",           probe_swap1 },
   { "swsuspend", 0, 0x7ff6,  9, "S2SUSPEND",           probe_swap1 },
+  { "swsuspend", 0, 0x7ff6,  9, "ULSUSPEND",           probe_swap1 },
   { "swap",     0, 0xfff6, 10, "SWAP-SPACE",           probe_swap0 },
   { "swap",     0, 0xfff6, 10, "SWAPSPACE2",           probe_swap1 },
   { "swsuspend", 0, 0xfff6,  9, "S1SUSPEND",           probe_swap1 },
   { "swsuspend", 0, 0xfff6,  9, "S2SUSPEND",           probe_swap1 },
+  { "swsuspend", 0, 0xfff6,  9, "ULSUSPEND",           probe_swap1 },
   { "ocfs",     0,      8,  9, "OracleCFS",            probe_ocfs },
   { "ocfs2",    1,      0,  6, "OCFSV2",               probe_ocfs2 },
   { "ocfs2",    2,      0,  6, "OCFSV2",               probe_ocfs2 },