[debian-edu-commits] r79870 - in branches/wheezy/debian-edu-config: debian share/debian-edu-config/d-i

[pere at alioth.debian.org]

Author: pere
Date: 2013-05-01 06:29:28 +0000 (Wed, 01 May 2013)
New Revision: 79870

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/share/debian-edu-config/d-i/finish-install
Log:
Make d-i hook to increase entropy when running low more robust
and get it to log any error messages to syslog.  Also make sure
it check the entropy level more often.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-05-01 05:13:27 UTC (rev 79869)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-05-01 06:29:28 UTC (rev 79870)
@@ -1,3 +1,12 @@
+debian-edu-config (1.704~svn79860) UNRELEASED; urgency=low
+
+  [ Petter Reinholdtsen ]
+  * Make d-i hook to increase entropy when running low more robust
+    and get it to log any error messages to syslog.  Also make sure
+    it check the entropy level more often.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Wed, 01 May 2013 08:27:43 +0200
+
 debian-edu-config (1.704~svn79859) wheezy-test; urgency=low
 
   [ Petter Reinholdtsen ]

Modified: branches/wheezy/debian-edu-config/share/debian-edu-config/d-i/finish-install
===================================================================
--- branches/wheezy/debian-edu-config/share/debian-edu-config/d-i/finish-install	2013-05-01 05:13:27 UTC (rev 79869)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/d-i/finish-install	2013-05-01 06:29:28 UTC (rev 79870)
@@ -64,7 +64,7 @@
            # find and touch/rm causes disk IO.
            sync
            echo 3 > /proc/sys/vm/drop_caches
-           find /target > /dev/null 2>&1
+           find /target > /dev/null || true
            touch /target/var/tmp/foo
            sync
            rm /target/var/tmp/foo
@@ -72,9 +72,9 @@
            entropy="$(cat /proc/sys/kernel/random/entropy_avail)"
            log "entropy pool is $entropy after trying to add"
        fi
-       sleep 120
+       sleep 20
    done
-) < /dev/null > /dev/null 2>&1 3>&1 4>&1 5>&1 6>&1 &
+) < /dev/null 2>&1 3>/dev/null 4>&3 5>&3 6>&3 | logger -t edu-entropy-add &
 epid=$!