initscripts: parametrize random seed file location
authorRichard Tollerton <rich.tollerton@ni.com>
Thu, 17 Jul 2014 21:56:54 +0000 (16:56 -0500)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 18 Jul 2014 23:08:59 +0000 (00:08 +0100)
Currently, the random seed file location is hardcoded to
/var/lib/urandom/random-seed.  Refactor it to a parameter
(RANDOM_SEED_FILE) so the file location is defined in only one place.

(From OE-Core rev: 558ba23cfdd60bf64b9214460a2772be70079796)

Signed-off-by: Richard Tollerton <rich.tollerton@ni.com>
Signed-off-by: Ben Shelton <ben.shelton@ni.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-core/initscripts/initscripts-1.0/urandom

index eb3a7c3..a0549de 100755 (executable)
@@ -12,6 +12,9 @@
 ### END INIT INFO
 
 test -c /dev/urandom || exit 0
+
+RANDOM_SEED_FILE=/var/lib/urandom/random-seed
+
 . /etc/default/rcS
 
 case "$1" in
@@ -19,13 +22,13 @@ case "$1" in
                test "$VERBOSE" != no && echo "Initializing random number generator..."
                # Load and then save 512 bytes,
                # which is the size of the entropy pool
-               if test -f /var/lib/urandom/random-seed
+               if test -f "$RANDOM_SEED_FILE"
                then
-                       cat /var/lib/urandom/random-seed >/dev/urandom
+                       cat "$RANDOM_SEED_FILE" >/dev/urandom
                fi
-               rm -f /var/lib/urandom/random-seed
+               rm -f "$RANDOM_SEED_FILE"
                umask 077
-               dd if=/dev/urandom of=/var/lib/urandom/random-seed count=1 \
+               dd if=/dev/urandom of=$RANDOM_SEED_FILE count=1 \
                        >/dev/null 2>&1 || echo "urandom start: failed."
                umask 022
                ;;
@@ -34,7 +37,7 @@ case "$1" in
                # see documentation in linux/drivers/char/random.c
                test "$VERBOSE" != no && echo "Saving random seed..."
                umask 077
-               dd if=/dev/urandom of=/var/lib/urandom/random-seed count=1 \
+               dd if=/dev/urandom of=$RANDOM_SEED_FILE count=1 \
                        >/dev/null 2>&1 || echo "urandom stop: failed."
                ;;
        *)