Package: mount
Version: 2.12r-16
Severity: normal
Tags: patch
Hi,
I'm very sorry, but I made an error in the patch I submitted against
#406204: swsusp-patch not applied
The way it is now will not work for userspace software suspend.
The patch attached now, applies on top of the previous one.
grts Tim
-- System Information:
Debian Release: 4.0
APT prefers testing
APT policy: (900, 'testing'), (20, 'unstable'), (19, 'experimental')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/dash
Kernel: Linux 2.6.19
Locale: LANG=C, LC_CTYPE=C (charmap=UTF-8) (ignored: LC_ALL set to nl_NL.utf8)
Versions of packages mount depends on:
ii libblkid 1.39+1.40-WIP-2006.11.14+dfsg-1 block device id library
ii libc6 2.3.6.ds1-8 GNU C Library: Shared libraries
ii libuuid1 1.39+1.40-WIP-2006.11.14+dfsg-1 universally unique id library
mount recommends no packages.
-- no debconf information
--- 30swsusp-resume.dpatch.old 2007-02-02 13:42:46.000000000 +0100
+++ 30swsusp-resume.dpatch 2007-02-02 13:42:46.000000000 +0100
@@ -67,7 +67,7 @@
#define SWAPON_NEEDS_TWO_ARGS
-@@ -164,6 +168,84 @@
+@@ -164,6 +168,85 @@
return 0 ;
}
@@ -98,7 +98,8 @@
+ if (lseek(fd, n, SEEK_SET) >= 0 &&
+ read(fd, buf, sizeof buf) == sizeof buf &&
+ (memcmp("S1SUSPEND", buf, 9)==0 ||
-+ memcmp("S2SUSPEND", buf, 9)==0))
++ memcmp("S2SUSPEND", buf, 9)==0 ||
++ memcmp("ULSUSPEND", buf, 9)==0))
+ re = 0;
+
+ close(fd);
