aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorzhangwei(Jovi) <jovi.zhangwei@huawei.com>2013-04-30 18:28:57 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-30 20:04:10 -0400
commite2a8b0a779787314eca1061308a8182e6c5bfabd (patch)
tree95c143b4ff873d43a55573e65929aa4f3909bedd /Documentation
parent7b6b99a02a8acfa8e71a990198c2ad0b9cc5cd71 (diff)
Documentation/sysrq: fix inconstistent help message of sysrq key
Currently help message of /proc/sysrq-trigger highlight its upper-case characters, like below: SysRq : HELP : loglevel(0-9) reBoot Crash terminate-all-tasks(E) memory-full-oom-kill(F) kill-all-tasks(I) ... this would confuse user trigger sysrq by upper-case character, which is inconsistent with the real lower-case character registed key. This inconsistent help message will also lead more confused when 26 upper-case letters put into use in future. This patch fix sysrq documentation. Signed-off-by: zhangwei(Jovi) <jovi.zhangwei@huawei.com> Cc: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/sysrq.txt20
1 files changed, 10 insertions, 10 deletions
diff --git a/Documentation/sysrq.txt b/Documentation/sysrq.txt
index 2a4cdda4828e..8cb4d7842a5f 100644
--- a/Documentation/sysrq.txt
+++ b/Documentation/sysrq.txt
@@ -129,9 +129,9 @@ On all - write a character to /proc/sysrq-trigger. e.g.:
129 129
130* Okay, so what can I use them for? 130* Okay, so what can I use them for?
131~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 131~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
132Well, un'R'aw is very handy when your X server or a svgalib program crashes. 132Well, unraw(r) is very handy when your X server or a svgalib program crashes.
133 133
134sa'K' (Secure Access Key) is useful when you want to be sure there is no 134sak(k) (Secure Access Key) is useful when you want to be sure there is no
135trojan program running at console which could grab your password 135trojan program running at console which could grab your password
136when you would try to login. It will kill all programs on given console, 136when you would try to login. It will kill all programs on given console,
137thus letting you make sure that the login prompt you see is actually 137thus letting you make sure that the login prompt you see is actually
@@ -143,20 +143,20 @@ IMPORTANT: such. :IMPORTANT
143useful when you want to exit a program that will not let you switch consoles. 143useful when you want to exit a program that will not let you switch consoles.
144(For example, X or a svgalib program.) 144(For example, X or a svgalib program.)
145 145
146re'B'oot is good when you're unable to shut down. But you should also 'S'ync 146reboot(b) is good when you're unable to shut down. But you should also
147and 'U'mount first. 147sync(s) and umount(u) first.
148 148
149'C'rash can be used to manually trigger a crashdump when the system is hung. 149crash(c) can be used to manually trigger a crashdump when the system is hung.
150Note that this just triggers a crash if there is no dump mechanism available. 150Note that this just triggers a crash if there is no dump mechanism available.
151 151
152'S'ync is great when your system is locked up, it allows you to sync your 152sync(s) is great when your system is locked up, it allows you to sync your
153disks and will certainly lessen the chance of data loss and fscking. Note 153disks and will certainly lessen the chance of data loss and fscking. Note
154that the sync hasn't taken place until you see the "OK" and "Done" appear 154that the sync hasn't taken place until you see the "OK" and "Done" appear
155on the screen. (If the kernel is really in strife, you may not ever get the 155on the screen. (If the kernel is really in strife, you may not ever get the
156OK or Done message...) 156OK or Done message...)
157 157
158'U'mount is basically useful in the same ways as 'S'ync. I generally 'S'ync, 158umount(u) is basically useful in the same ways as sync(s). I generally sync(s),
159'U'mount, then re'B'oot when my system locks. It's saved me many a fsck. 159umount(u), then reboot(b) when my system locks. It's saved me many a fsck.
160Again, the unmount (remount read-only) hasn't taken place until you see the 160Again, the unmount (remount read-only) hasn't taken place until you see the
161"OK" and "Done" message appear on the screen. 161"OK" and "Done" message appear on the screen.
162 162
@@ -165,11 +165,11 @@ kernel messages you do not want to see. Selecting '0' will prevent all but
165the most urgent kernel messages from reaching your console. (They will 165the most urgent kernel messages from reaching your console. (They will
166still be logged if syslogd/klogd are alive, though.) 166still be logged if syslogd/klogd are alive, though.)
167 167
168t'E'rm and k'I'll are useful if you have some sort of runaway process you 168term(e) and kill(i) are useful if you have some sort of runaway process you
169are unable to kill any other way, especially if it's spawning other 169are unable to kill any other way, especially if it's spawning other
170processes. 170processes.
171 171
172"'J'ust thaw it" is useful if your system becomes unresponsive due to a frozen 172"just thaw it(j)" is useful if your system becomes unresponsive due to a frozen
173(probably root) filesystem via the FIFREEZE ioctl. 173(probably root) filesystem via the FIFREEZE ioctl.
174 174
175* Sometimes SysRq seems to get 'stuck' after using it, what can I do? 175* Sometimes SysRq seems to get 'stuck' after using it, what can I do?