Hello community, here is the log from the commit of package suspend checked in at Sun Apr 2 22:00:29 CEST 2006. -------- --- arch/i386/suspend/suspend.changes 2006-03-27 16:37:15.000000000 +0200 +++ suspend/suspend.changes 2006-04-02 21:08:52.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Apr 2 21:07:50 CEST 2006 - seife@suse.de + +- fix the s2ram --force option (bug #159688) + +------------------------------------------------------------------- New: ---- s2ram-force-fix.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suspend.spec ++++++ --- /var/tmp/diff_new_pack.tVwAqY/_old 2006-04-02 22:00:06.000000000 +0200 +++ /var/tmp/diff_new_pack.tVwAqY/_new 2006-04-02 22:00:06.000000000 +0200 @@ -13,12 +13,13 @@ Name: suspend BuildRequires: pciutils-devel Version: 20060327 -Release: 1 +Release: 2 Summary: A Set Of Tools To Support Sleep Modes License: GPL URL: http://sourceforge.net/projects/suspend Group: System/Console Source: %{name}-%{version}.tar.bz2 +Patch: s2ram-force-fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Supplements: powersave @@ -34,6 +35,7 @@ %prep %setup -q +%patch -p1 %build make s2ram ARCH=%_arch @@ -52,6 +54,8 @@ %doc README README.s2ram-whitelist %changelog -n suspend +* Sun Apr 02 2006 - seife@suse.de +- fix the s2ram --force option (bug #159688) * Mon Mar 27 2006 - seife@suse.de - Rework the various s2ram workarounds so the functions can be used cleanly, move the supported/unsupported logic to main(). ++++++ s2ram-force-fix.diff ++++++ --- /tmp/s2ram.c 2006-04-02 21:00:41.000000000 +0200 +++ suspend-20060327/s2ram.c 2006-04-02 21:02:46.000000000 +0200 @@ -262,7 +262,7 @@ static void usage(void) int main(int argc, char *argv[]) { - int i, ret, test_mode = 0, force = 0; + int i, ret = 0, test_mode = 0, force = 0; int active_console = -1; struct option options[] = { { "test", no_argument, NULL, 'n'}, @@ -318,9 +318,10 @@ int main(int argc, char *argv[]) usage(); } - ret = s2ram_check(); + if (!force) + ret = s2ram_check(); - if (!force && ret == S2RAM_UNKNOWN) { + if (ret == S2RAM_UNKNOWN) { printf("Machine is unknown.\n"); identify_machine(); goto out; @@ -334,7 +335,7 @@ int main(int argc, char *argv[]) goto out; } - if (!force && ret) + if (ret) goto out; /* switch to console 1 first, since we might be in X */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...