[Yaird-devel] Bug#368976: yaird: resume support only works for old suspend2 versions

[Hamish Moffatt]

Package: yaird
Version: 0.0.12-10
Severity: normal
Tags: patch

The resume support in 0.0.12-10 only works for old versions of suspend2
(plus suspend1). I submitted a patch for this in #329319 months ago but
unfortunately it doesn't seem to have made it in. Here it is as a
separate bug report; I gather there's some reason why #329319 overall
hasn't been closed/resolved yet. Thanks.

I've tested this here with suspend2 2.2rc16 (which is a bit old in
itself) and it works fine.

Hamish

--- 1005_add_resume_support.patch.orig	2006-05-26 23:26:35.000000000 +1000
+++ 1005_add_resume_support.patch	2006-05-26 23:20:14.000000000 +1000
@@ -151,7 +151,7 @@
  			!	ydebug)
  			!		INIT_DEBUG=yes
  			!	esac
-@@ -368,6 +384,40 @@ TEMPLATE SET
+@@ -368,6 +384,43 @@ TEMPLATE SET
  
  
  	#
@@ -163,8 +163,11 @@
 +		BEGIN
 +			!if [ -z "$noresume" ]
 +			!then
-+			!  # for suspend2
-+			!  # XXX: untested!
++			!  # for suspend2 (>= 2.2-rc8)
++			!  if [ -w /proc/suspend2/do_resume ]; then
++			!    echo > /proc/suspend2/do_resume
++			!  fi
++			!  # for suspend2 (< 2.2-rc8)
 +			!  if [ -w /proc/software_suspend/do_resume ]; then
 +			!    echo > /proc/software_suspend/do_resume
 +			!  fi
@@ -234,7 +237,7 @@
  			!	ydebug)
  			!		INIT_DEBUG=yes
  			!	esac
-@@ -379,6 +395,40 @@ TEMPLATE SET
+@@ -379,6 +395,43 @@ TEMPLATE SET
  
  
  	#
@@ -246,8 +249,11 @@
 +		BEGIN
 +			!if [ -z "$noresume" ]
 +			!then
-+			!  # for suspend2
-+			!  # XXX: untested!
++			!  # for suspend2 (>= 2.2-rc8)
++			!  if [ -w /proc/suspend2/do_resume ]; then
++			!    echo > /proc/suspend2/do_resume
++			!  fi
++			!  # for suspend2 (< 2.2-rc8)
 +			!  if [ -w /proc/software_suspend/do_resume ]; then
 +			!    echo > /proc/software_suspend/do_resume
 +			!  fi

-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.15.1
Locale: LANG=en_AU, LC_CTYPE=en_AU (charmap=ISO-8859-1)

Versions of packages yaird depends on:
ii  cpio                         2.6-11      GNU cpio -- a program to manage ar
ii  dash                         0.5.3-3     The Debian Almquist Shell
ii  libc6                        2.3.6-7     GNU C Library: Shared libraries
ii  libhtml-template-perl        2.8-1       HTML::Template : A module for usin
ii  libparse-recdescent-perl     1.94.free-1 Generates recursive-descent parser
ii  perl                         5.8.8-4     Larry Wall's Practical Extraction 

yaird recommends no packages.

-- no debconf information