From abaa11240a742bcfc4783e2cbebb7dd0cdf17e96 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Tue, 6 Sep 2005 06:42:49 -0400 Subject: [PATCH] Add support for detecting software suspend partitions to blkid Signed-off-by: Karel Zak Signed-off-by: "Theodore Ts'o" --- lib/blkid/ChangeLog | 2 ++ lib/blkid/probe.c | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/lib/blkid/ChangeLog b/lib/blkid/ChangeLog index 0d0607b50..e60ce6af7 100644 --- a/lib/blkid/ChangeLog +++ b/lib/blkid/ChangeLog @@ -1,5 +1,7 @@ 2005-09-05 Karel Zak + * probe.c: Add support for detecting software suspend partitions + * probe.c (probe_ext2): Check to see if a journal has been added to an ext2 filesystem when revalidating cached information about an ext2 device. diff --git a/lib/blkid/probe.c b/lib/blkid/probe.c index 116a0ca65..fd076ca30 100644 --- a/lib/blkid/probe.c +++ b/lib/blkid/probe.c @@ -529,14 +529,24 @@ static struct blkid_magic type_array[] = { { "sysv", 0, 0x3f8, 4, "\020~\030\375", 0 }, { "swap", 0, 0xff6, 10, "SWAP-SPACE", probe_swap0 }, { "swap", 0, 0xff6, 10, "SWAPSPACE2", probe_swap1 }, + { "swsuspend", 0, 0xff6, 9, "S1SUSPEND", probe_swap1 }, + { "swsuspend", 0, 0xff6, 9, "S2SUSPEND", 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 }, { "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 }, { "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 }, { "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 }, { "ocfs", 0, 8, 9, "OracleCFS", probe_ocfs }, { "ocfs2", 1, 0, 6, "OCFSV2", probe_ocfs2 }, { "ocfs2", 2, 0, 6, "OCFSV2", probe_ocfs2 }, -- 2.47.3