summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2012-12-17 11:19:35 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2012-12-17 11:19:35 +0000
commit0ca18adbd965e9fa68811e608a8498b5a9d17bf4 (patch)
treebdcc5c4faceb81f2630a3720375997e1520a46e0 /sys-apps/rng-tools/files
parentBackport fix for underlinking, #447574 (diff)
downloadgentoo-2-0ca18adbd965e9fa68811e608a8498b5a9d17bf4.tar.gz
gentoo-2-0ca18adbd965e9fa68811e608a8498b5a9d17bf4.tar.bz2
gentoo-2-0ca18adbd965e9fa68811e608a8498b5a9d17bf4.zip
Handle NO_TPM the way NO_DRNG is handled, as otherwise it can fail the same way.
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342)
Diffstat (limited to 'sys-apps/rng-tools/files')
-rw-r--r--sys-apps/rng-tools/files/rngd-initd-4.14
1 files changed, 2 insertions, 2 deletions
diff --git a/sys-apps/rng-tools/files/rngd-initd-4.1 b/sys-apps/rng-tools/files/rngd-initd-4.1
index 67c21c58920d..54debbfbccf6 100644
--- a/sys-apps/rng-tools/files/rngd-initd-4.1
+++ b/sys-apps/rng-tools/files/rngd-initd-4.1
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/files/rngd-initd-4.1,v 1.3 2012/12/16 14:36:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/files/rngd-initd-4.1,v 1.4 2012/12/17 11:19:35 flameeyes Exp $
depend() {
need localmount
@@ -25,6 +25,6 @@ RNG_DEVICE="${DEVICE:-$(find_device)}"
command=/usr/sbin/rngd
pidfile="/var/run/${SVCNAME}.pid"
-command_args="--pid-file ${pidfile} --background --random-step ${STEP:-64} --no-tpm=${NO_TPM:-0} ${NO_DRNG:+--no-drng=1} --fill-watermark ${WATERMARK} ${RNG_DEVICE:+--rng-device ${RNG_DEVICE}}"
+command_args="--pid-file ${pidfile} --background --random-step ${STEP:-64} ${NO_TPM:+--no-tmp=1} ${NO_DRNG:+--no-drng=1} --fill-watermark ${WATERMARK} ${RNG_DEVICE:+--rng-device ${RNG_DEVICE}}"
start_stop_daemon_args="--wait 1000"
retry="SIGKILL/5000"