rng-tools: improve startup script

- Use short arguments for start-stop-daemon
- Fix path to the daemon (it isn't in /usr/local)
- Allow specifying the RNG device in /etc/default/rng-tools

Signed-off-by: Chris Larson <chris_larson@mentor.com>

diff --git a/recipes/rng-tools/files/default b/recipes/rng-tools/files/default
new file mode 100644 (file)
index 0000000..ab7cd93
--- /dev/null
+++ b/recipes/rng-tools/files/default
@@ -0,0 +1,2 @@
+# Specify rng device
+RNG_DEVICE=/dev/hwrng

diff --git a/recipes/rng-tools/files/init b/recipes/rng-tools/files/init
index e12f71c..5fa5959 100755 (executable)
--- a/recipes/rng-tools/files/init
+++ b/recipes/rng-tools/files/init
@@ -5,32 +5,40 @@
 # > update-rc.d rng-tools defaults 60
 #
 
-rngd=/usr/local/sbin/rngd
+rngd=/usr/sbin/rngd
 test -x "$rngd" || exit 1
 
+if [ -e /etc/default/rng-tools ]; then
+    . /etc/default/rng-tools
+fi
+
+if [ -n "$RNG_DEVICE" ]; then
+    EXTRA_ARGS="-- -r $RNG_DEVICE"
+fi
+
 
 case "$1" in
   start)
     echo -n "Starting random number generator daemon"
-    start-stop-daemon --start --quiet --exec $rngd
+    start-stop-daemon -S -q -x $rngd $EXTRA_ARGS
     echo "."
     ;;
   stop)
     echo -n "Stopping random number generator daemon"
-    start-stop-daemon --stop --quiet -n rngd
+    start-stop-daemon -K -q -n rngd
     echo "."
     ;;
   reload|force-reload)
     echo -n "Signalling rng daemon restart"
-    start-stop-daemon --stop --quiet --signal 1 --exec $rngd
-    start-stop-daemon --stop --quiet --signal 1 --exec $rngd
+    start-stop-daemon -K -q -s 1 -x $rngd
+    start-stop-daemon -K -q -s 1 -x $rngd
     ;;
   restart)
     echo -n "Stopping random number generator daemon"
-    start-stop-daemon --stop --quiet -n rngd
+    start-stop-daemon -K -q -n rngd
     echo "."
     echo -n "Starting random number generator daemon"
-    start-stop-daemon --start --quiet --exec $rngd
+    start-stop-daemon -S -q -x $rngd $EXTRA_ARGS
     echo "."
     ;;
   *)

diff --git a/recipes/rng-tools/rng-tools_2.bb b/recipes/rng-tools/rng-tools_2.bb
index f67a737..fe1ed7c 100644 (file)
--- a/recipes/rng-tools/rng-tools_2.bb
+++ b/recipes/rng-tools/rng-tools_2.bb
@@ -1,10 +1,11 @@
 DESCRIPTION = "Random number generator daemon"
 LICENSE = "GPL"
 DEPENDS_append_libc-uclibc = " argp-standalone"
-PR = "2"
+PR = "3"
 
 SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/gkernel/${P}.tar.gz \
-           file://init"
+           file://init \
+           file://default"
 
 inherit autotools update-rc.d
 
@@ -13,7 +14,11 @@ INITSCRIPT_PARAMS = "defaults"
 
 do_install_append() {
         install -d "${D}${sysconfdir}/init.d"
-        install -c -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rng-tools
+        sed -e's,/etc/,${sysconfdir}/,; s,/usr/sbin/,${sbindir},' \
+            ${WORKDIR}/init > ${D}${sysconfdir}/init.d/rng-tools
+
+        install -d "${D}${sysconfdir}/default"
+        install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default
 }
 
 SRC_URI[md5sum] = "63d503191eabed630324c104cc024475"