提交 39fab87a 编写于 作者: J Jason A. Donenfeld 提交者: Zheng Zengkai

random: fix sysctl documentation nits

stable inclusion
from stable-v5.10.119
commit ec25e386d38190441a6a13423ec5fe842409c254
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5L6BB

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=ec25e386d38190441a6a13423ec5fe842409c254

--------------------------------

commit 069c4ea6 upstream.

A semicolon was missing, and the almost-alphabetical-but-not ordering
was confusing, so regroup these by category instead.
Signed-off-by: NJason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>
上级 ed432308
...@@ -1006,6 +1006,9 @@ This is a directory, with the following entries: ...@@ -1006,6 +1006,9 @@ This is a directory, with the following entries:
* ``boot_id``: a UUID generated the first time this is retrieved, and * ``boot_id``: a UUID generated the first time this is retrieved, and
unvarying after that; unvarying after that;
* ``uuid``: a UUID generated every time this is retrieved (this can
thus be used to generate UUIDs at will);
* ``entropy_avail``: the pool's entropy count, in bits; * ``entropy_avail``: the pool's entropy count, in bits;
* ``poolsize``: the entropy pool size, in bits; * ``poolsize``: the entropy pool size, in bits;
...@@ -1013,10 +1016,7 @@ This is a directory, with the following entries: ...@@ -1013,10 +1016,7 @@ This is a directory, with the following entries:
* ``urandom_min_reseed_secs``: obsolete (used to determine the minimum * ``urandom_min_reseed_secs``: obsolete (used to determine the minimum
number of seconds between urandom pool reseeding). This file is number of seconds between urandom pool reseeding). This file is
writable for compatibility purposes, but writing to it has no effect writable for compatibility purposes, but writing to it has no effect
on any RNG behavior. on any RNG behavior;
* ``uuid``: a UUID generated every time this is retrieved (this can
thus be used to generate UUIDs at will);
* ``write_wakeup_threshold``: when the entropy count drops below this * ``write_wakeup_threshold``: when the entropy count drops below this
(as a number of bits), processes waiting to write to ``/dev/random`` (as a number of bits), processes waiting to write to ``/dev/random``
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册