[gentoo-commits] gentoo-x86 commit in app-crypt/ekey-egd-linux/files: ekey-egd-linux.conf ekey-egd-linux.init

[Diego Petteno (flameeyes)]

flameeyes    11/04/04 12:20:55

  Modified:             ekey-egd-linux.conf ekey-egd-linux.init
  Log:
  Improve init script and defaults: default to 8888 for port (used by other EGD services); set variables by default if they are not set by the configuration file; only set watermark if it is configured; start after ekeyd.
  
  (Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  app-crypt/ekey-egd-linux/files/ekey-egd-linux.conf

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekey-egd-linux/files/ekey-egd-linux.conf?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekey-egd-linux/files/ekey-egd-linux.conf?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekey-egd-linux/files/ekey-egd-linux.conf?r1=1.1&r2=1.2

Index: ekey-egd-linux.conf
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-crypt/ekey-egd-linux/files/ekey-egd-linux.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ekey-egd-linux.conf	23 Oct 2010 17:19:32 -0000	1.1
+++ ekey-egd-linux.conf	4 Apr 2011 12:20:55 -0000	1.2
@@ -1,10 +1,12 @@
-# Host IP address to connect to.
-HOST="localhost"
+# Configuration file for ekey-egd-linux
+
+# Hostname or IP address to connect to.
+#HOST="localhost"
 # Port number to connect to.
-PORT="1234"
+#PORT="8888"
 # Time  between reconnect attempts.
-RECONNECTINTERVAL=10
+#RECONNECTINTERVAL=10
 # Set the number of 1024 bit blocks to request each time
-BLOCKS=2
+#BLOCKS=2
 # Low level entropy to trigger egd-linux entropy read
 WATERMARK=1024



1.2                  app-crypt/ekey-egd-linux/files/ekey-egd-linux.init

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekey-egd-linux/files/ekey-egd-linux.init?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekey-egd-linux/files/ekey-egd-linux.init?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekey-egd-linux/files/ekey-egd-linux.init?r1=1.1&r2=1.2

Index: ekey-egd-linux.init
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-crypt/ekey-egd-linux/files/ekey-egd-linux.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ekey-egd-linux.init	23 Oct 2010 17:19:32 -0000	1.1
+++ ekey-egd-linux.init	4 Apr 2011 12:20:55 -0000	1.2
@@ -1,10 +1,16 @@
 #!/sbin/runscript
-# Copyright 2009-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekey-egd-linux/files/ekey-egd-linux.init,v 1.1 2010/10/23 17:19:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekey-egd-linux/files/ekey-egd-linux.init,v 1.2 2011/04/04 12:20:55 flameeyes Exp $
+
+: ${HOST:=localhost}
+: ${PORT:=8888}
+: ${RECONNECTINTERVAL:=10}
+: ${BLOCKS:=2}
 
 depend() {
 	 use net
+	 after ekeyd
 }
 
 start() {
@@ -16,7 +22,10 @@
 		-r ${RECONNECTINTERVAL} \
 		-b ${BLOCKS} \
 		-D "/var/run/${SVCNAME}.pid"
-	sysctl kernel.random.write_wakeup_threshold=$WATERMARK >/dev/null 2>&1
+
+	[ -n "${WATERMARK}" ] && \
+		sysctl "kernel.random.write_wakeup_threshold=$WATERMARK" >/dev/null 2>&1
+
 	eend $?
 }
 
@@ -27,4 +36,3 @@
 		--exec /usr/libexec/ekey-egd-linux
 	eend $?
 }
-