[PATCH] swsusp kconfig: Change in wording (fwd)

[PATCH] swsusp kconfig: Change in wording (fwd)

[Pavel Machek]

Hi!

Vadim says:

I was reading through the kernel/power/Kconfig file, and noticed that
the wording was slightly unclear. I poked at it a bit, hopefully making
the description a tad more straightforward, but you be the judge. :)
Diffed against 2.6.10-rc2.

Please apply,
								Pavel

From: Vadim Lobanov <vlobanov@speakeasy.net>
Signed-off-by: Vadim Lobanov <vlobanov@speakeasy.net>
Signed-off-by: Pavel Machek <pavel@suse.cz>

===========================================================================
diff -Nru a/kernel/power/Kconfig b/kernel/power/Kconfig
--- a/kernel/power/Kconfig      2004-11-14 21:56:22.000000000 -0800
+++ b/kernel/power/Kconfig      2004-11-25 20:41:57.000000000 -0800
@@ -35,14 +35,13 @@
          You may suspend your machine by 'swsusp' or 'shutdown -z <time>'
          (patch for sysvinit needed).

-         It creates an image which is saved in your active swaps. By the next
-         booting the, pass 'resume=/dev/swappartition' and kernel will
-         detect the saved image, restore the memory from
-         it and then it continues to run as before you've suspended.
-         If you don't want the previous state to continue use the 'noresume'
-         kernel option. However note that your partitions will be fsck'd and
-         you must re-mkswap your swap partitions. It does not work with swap
-         files.
+         It creates an image which is saved in your active swap. Upon next
+         boot, pass the 'resume=/dev/swappartition' argument to the kernel to
+         have it detect the saved image, restore memory state from it, and
+         continue to run as before. If you do not want the previous state to
+         be reloaded, then use the 'noresume' kernel argument. However, note
+         that your partitions will be fsck'd and you must re-mkswap your swap
+         partitions. It does not work with swap files.

          Right now you may boot without resuming and then later resume but
          in meantime you cannot use those swap partitions/files which were
===========================================================================

-- 
People were complaining that M$ turns users into beta-testers...
...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!

Re: [PATCH] swsusp kconfig: Change in wording (fwd)

[Stefan Seyfried]

Pavel Machek wrote:

>           Right now you may boot without resuming and then later resume but
>           in meantime you cannot use those swap partitions/files which were

Is this still true? Don't we kill the image early, even with "noresume"?
It is of course possible by omitting the "resume=" parameter, but not
for the faint of heart ;-)

   Stefan

Re: [PATCH] swsusp kconfig: Change in wording (fwd)

[Pavel Machek]

Hi!

> >           Right now you may boot without resuming and then later resume but
> >           in meantime you cannot use those swap partitions/files which were
> 
> Is this still true? Don't we kill the image early, even with "noresume"?
> It is of course possible by omitting the "resume=" parameter, but not
> for the faint of heart ;-)

You are right, user would have to remove resume= parameter, and we do
not want users to do this kind of tricks, so this probably has no
place in configure.help.... Feel free to send followup patch when the
dust settles.
								Pavel
-- 
People were complaining that M$ turns users into beta-testers...
...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!