summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof Pawlik <nelchael@gentoo.org>2009-07-15 19:47:25 +0000
committerKrzysztof Pawlik <nelchael@gentoo.org>2009-07-15 19:47:25 +0000
commita6fbe23104f03537d98a57fe668d81fad7b4bf52 (patch)
treeaf6f9c330ea7ff6bd57a234dc2b85f75207331ef /sys-apps
parentInstall modsec-rules-updater in sbin, since it requires root privileges. (diff)
downloadgentoo-2-a6fbe23104f03537d98a57fe668d81fad7b4bf52.tar.gz
gentoo-2-a6fbe23104f03537d98a57fe668d81fad7b4bf52.tar.bz2
gentoo-2-a6fbe23104f03537d98a57fe668d81fad7b4bf52.zip
Check /dev/hwrng, see bug #276973.
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/rng-tools/ChangeLog7
-rw-r--r--sys-apps/rng-tools/files/2/rngd7
2 files changed, 10 insertions, 4 deletions
diff --git a/sys-apps/rng-tools/ChangeLog b/sys-apps/rng-tools/ChangeLog
index c327c60769f1..fa0957360bf5 100644
--- a/sys-apps/rng-tools/ChangeLog
+++ b/sys-apps/rng-tools/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/rng-tools
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/ChangeLog,v 1.23 2009/03/21 22:34:33 nelchael Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/ChangeLog,v 1.24 2009/07/15 19:47:22 nelchael Exp $
+
+ 15 Jul 2009; Krzysiek Pawlik <nelchael@gentoo.org> files/2/rngd:
+ Check /dev/hwrng, see bug #276973.
21 Mar 2009; Krzysiek Pawlik <nelchael@gentoo.org> rng-tools-2.ebuild:
Fix QA warnings.
diff --git a/sys-apps/rng-tools/files/2/rngd b/sys-apps/rng-tools/files/2/rngd
index 11cd5fde77c2..e11425552528 100644
--- a/sys-apps/rng-tools/files/2/rngd
+++ b/sys-apps/rng-tools/files/2/rngd
@@ -1,13 +1,13 @@
#!/sbin/runscript
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/files/2/rngd,v 1.1 2006/03/20 09:33:00 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/files/2/rngd,v 1.2 2009/07/15 19:47:25 nelchael Exp $
depend() {
need localmount
after random
}
-
+
start() {
ebegin "Starting hardware RNG daemon"
if [ -e /dev/hw_random ]; then
@@ -19,6 +19,9 @@ start() {
elif [ -e /dev/i810_rng ]; then
start-stop-daemon --start --quiet --exec /usr/sbin/rngd -- -s ${STEP-64} -t ${TIMEOUT-60} -b -r /dev/i810_rng
eend $? "Failed to start hardware RNG daemon"
+ elif [ -e /dev/hwrng ]; then
+ start-stop-daemon --start --quiet --exec /usr/sbin/rngd -- -s ${STEP-64} -t ${TIMEOUT-60} -b -r /dev/hwrng
+ eend $? "Failed to start hardware RNG daemon"
else
einfo "No hardware RNG found, using /dev/urandom as feedback input"
start-stop-daemon --start --quiet --exec /usr/sbin/rngd -- -s ${STEP-64} -t ${TIMEOUT-60} -b -r /dev/urandom