* [gentoo-commits] gentoo-x86 commit in sys-apps/rng-tools/files: rngd-initd-4.1
@ 2012-12-16 14:36 Diego Petteno (flameeyes)
0 siblings, 0 replies; 3+ messages in thread
From: Diego Petteno (flameeyes) @ 2012-12-16 14:36 UTC (permalink / raw
To: gentoo-commits
flameeyes 12/12/16 14:36:44
Modified: rngd-initd-4.1
Log:
Fix init script also when using an actual RNG device. Closes bug #447464 by Toralf Förster.
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342)
Revision Changes Path
1.3 sys-apps/rng-tools/files/rngd-initd-4.1
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/rng-tools/files/rngd-initd-4.1?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/rng-tools/files/rngd-initd-4.1?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/rng-tools/files/rngd-initd-4.1?r1=1.2&r2=1.3
Index: rngd-initd-4.1
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/files/rngd-initd-4.1,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rngd-initd-4.1 16 Dec 2012 08:25:58 -0000 1.2
+++ rngd-initd-4.1 16 Dec 2012 14:36:44 -0000 1.3
@@ -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.2 2012/12/16 08:25:58 flameeyes Exp $
+# $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 $
depend() {
need localmount
@@ -25,6 +25,6 @@
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 $(find_rng_device)}"
+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}}"
start_stop_daemon_args="--wait 1000"
retry="SIGKILL/5000"
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/rng-tools/files: rngd-initd-4.1
@ 2012-12-17 11:19 Diego Petteno (flameeyes)
0 siblings, 0 replies; 3+ messages in thread
From: Diego Petteno (flameeyes) @ 2012-12-17 11:19 UTC (permalink / raw
To: gentoo-commits
flameeyes 12/12/17 11:19:35
Modified: rngd-initd-4.1
Log:
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)
Revision Changes Path
1.4 sys-apps/rng-tools/files/rngd-initd-4.1
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/rng-tools/files/rngd-initd-4.1?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/rng-tools/files/rngd-initd-4.1?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/rng-tools/files/rngd-initd-4.1?r1=1.3&r2=1.4
Index: rngd-initd-4.1
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/files/rngd-initd-4.1,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rngd-initd-4.1 16 Dec 2012 14:36:44 -0000 1.3
+++ rngd-initd-4.1 17 Dec 2012 11:19:35 -0000 1.4
@@ -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 @@
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"
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/rng-tools/files: rngd-initd-4.1
@ 2012-12-24 17:03 Diego Petteno (flameeyes)
0 siblings, 0 replies; 3+ messages in thread
From: Diego Petteno (flameeyes) @ 2012-12-24 17:03 UTC (permalink / raw
To: gentoo-commits
flameeyes 12/12/24 17:03:01
Modified: rngd-initd-4.1
Log:
Fix typo. Thanks to Chris Mayo for reporting.
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342)
Revision Changes Path
1.6 sys-apps/rng-tools/files/rngd-initd-4.1
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/rng-tools/files/rngd-initd-4.1?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/rng-tools/files/rngd-initd-4.1?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/rng-tools/files/rngd-initd-4.1?r1=1.5&r2=1.6
Index: rngd-initd-4.1
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/files/rngd-initd-4.1,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rngd-initd-4.1 17 Dec 2012 12:19:19 -0000 1.5
+++ rngd-initd-4.1 24 Dec 2012 17:03:01 -0000 1.6
@@ -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.5 2012/12/17 12:19:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/files/rngd-initd-4.1,v 1.6 2012/12/24 17:03:01 flameeyes Exp $
depend() {
need localmount
@@ -24,6 +24,6 @@
command=/usr/sbin/rngd
pidfile="/var/run/${SVCNAME}.pid"
-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}}"
+command_args="--pid-file ${pidfile} --background --random-step ${STEP:-64} ${NO_TPM:+--no-tpm=1} ${NO_DRNG:+--no-drng=1} --fill-watermark ${WATERMARK} ${RNG_DEVICE:+--rng-device ${RNG_DEVICE}}"
start_stop_daemon_args="--wait 1000"
retry="SIGKILL/5000"
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-12-24 17:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-16 14:36 [gentoo-commits] gentoo-x86 commit in sys-apps/rng-tools/files: rngd-initd-4.1 Diego Petteno (flameeyes)
-- strict thread matches above, loose matches on Subject: below --
2012-12-17 11:19 Diego Petteno (flameeyes)
2012-12-24 17:03 Diego Petteno (flameeyes)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox