From: Harald Hoyer <harald.hoyer-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: Alexander Tsoy <alexander-EP/B3+myoZc@public.gmane.org>,
initramfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: Re: [PATCH 1/2] resume: fix swap detection in hostonly
Date: Wed, 09 Oct 2013 16:22:29 +0200 [thread overview]
Message-ID: <525566A5.20805@gmail.com> (raw)
In-Reply-To: <6734e993a6184b487097463179c3dd75357047b2.1381324538.git.alexander-EP/B3+myoZc@public.gmane.org>
On 10/09/2013 04:39 AM, Alexander Tsoy wrote:
> Check for other possible fs types. This fixes swap detection when using
> TuxOnIce kernel.
>
> Note that parse-resume.sh generate udev rules with support for
> ID_FS_TYPE=suspend, but we do not include it here, because it is
> libvolume_id thing and host_fs_types is populated using blkid.
> ---
> modules.d/95resume/module-setup.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/modules.d/95resume/module-setup.sh b/modules.d/95resume/module-setup.sh
> index b6d2c48..8b37616 100755
> --- a/modules.d/95resume/module-setup.sh
> +++ b/modules.d/95resume/module-setup.sh
> @@ -7,7 +7,7 @@ check() {
> # No point trying to support resume, if no swap partition exist
> [[ $hostonly ]] || [[ $mount_needs ]] && {
> for fs in "${host_fs_types[@]}"; do
> - [[ $fs = swap ]] && return 0
> + [[ $fs =~ ^(swap|swsuspend|swsupend)$ ]] && return 0
> done
> return 255
> }
>
Thanks! Pushed both
prev parent reply other threads:[~2013-10-09 14:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-09 2:39 [PATCH 1/2] resume: fix swap detection in hostonly Alexander Tsoy
[not found] ` <6734e993a6184b487097463179c3dd75357047b2.1381324538.git.alexander-EP/B3+myoZc@public.gmane.org>
2013-10-09 3:02 ` [PATCH 2/2] resume: remove resume-genrules.sh Alexander Tsoy
2013-10-09 14:22 ` Harald Hoyer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=525566A5.20805@gmail.com \
--to=harald.hoyer-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
--cc=alexander-EP/B3+myoZc@public.gmane.org \
--cc=initramfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox