From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-535159-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 06A861381F3
	for <garchives@archives.gentoo.org>; Sun, 16 Dec 2012 14:36:54 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id CC432E058F;
	Sun, 16 Dec 2012 14:36:46 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 4C72021C009
	for <gentoo-commits@lists.gentoo.org>; Sun, 16 Dec 2012 14:36:46 +0000 (UTC)
Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 62A4933DC74
	for <gentoo-commits@lists.gentoo.org>; Sun, 16 Dec 2012 14:36:45 +0000 (UTC)
Received: by flycatcher.gentoo.org (Postfix, from userid 948)
	id 2BBF92171E; Sun, 16 Dec 2012 14:36:44 +0000 (UTC)
From: "Diego Petteno (flameeyes)" <flameeyes@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Reply-To: gentoo-dev@lists.gentoo.org, flameeyes@gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/rng-tools/files: rngd-initd-4.1
X-VCS-Repository: gentoo-x86
X-VCS-Files: rngd-initd-4.1
X-VCS-Directories: sys-apps/rng-tools/files
X-VCS-Committer: flameeyes
X-VCS-Committer-Name: Diego Petteno
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
Message-Id: <20121216143644.2BBF92171E@flycatcher.gentoo.org>
Date: Sun, 16 Dec 2012 14:36:44 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: dc5f7ead-ef0b-4c9d-9cdc-89a5011ab410
X-Archives-Hash: 9424ce127e5656fac2e11659ef6a47b6

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"