[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] Drop obsolete code in d-i/finish-install now that d-i uses haveged (via a...

[Holger Levsen]

Holger Levsen pushed to branch master at Debian Edu / debian-edu-config


Commits:
34679f67 by Holger Levsen at 2019-04-20T08:50:34Z
Drop obsolete code in d-i/finish-install now that d-i uses haveged (via a newly introduced udeb) or a hardware RNG. (See #923675).

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


2 changed files:

- debian/changelog
- share/debian-edu-config/d-i/finish-install


Changes:

=====================================
debian/changelog
=====================================
@@ -1,7 +1,8 @@
 debian-edu-config (2.10.66) UNRELEASED; urgency=medium
 
-  * Add comment about our d-i finish-install code to add entropy
-    becoming obsolete (See #923675).
+  [ Holger Levsen ]
+  * Drop obsolete code in d-i/finish-install now that d-i uses haveged (via a
+    newly introduced udeb) or a hardware RNG. (See #923675).
 
  -- Petter Reinholdtsen <pere at debian.org>  Sat, 20 Apr 2019 07:53:26 +0200
 


=====================================
share/debian-edu-config/d-i/finish-install
=====================================
@@ -37,31 +37,6 @@ PROFILE="$RET"
 # easier to track our changes
 edu-etcvcs commit
 
-# Try to add entropy when running low
-# FIXME this feature can be removed when haveged is part of Debian Installer, see #923675
-(
-   cd /
-   while true ; do
-       entropy="$(cat /proc/sys/kernel/random/entropy_avail)"
-       if [ 130 -gt "$entropy" ] ; then
-           log "low on entropy, pool is $entropy. trying to add more"
-           # Disk IO add entropy to the kernel.  Flush cache to ensure
-           # find and touch/rm causes disk IO.
-           sync
-           echo 3 > /proc/sys/vm/drop_caches
-           find /target > /dev/null || true
-           touch /target/var/tmp/foo
-           sync
-           rm /target/var/tmp/foo
-           sync
-           entropy="$(cat /proc/sys/kernel/random/entropy_avail)"
-           log "entropy pool is $entropy after trying to add"
-       fi
-       sleep 20
-   done
-) < /dev/null 2>&1 3>/dev/null 4>&3 5>&3 6>&3 | logger -t edu-entropy-add &
-epid=$!
-
 # Make the installation look more like a finished system, to make sure
 # debconf-get-selections --installer work.
 . /usr/lib/finish-install.d/94save-logs



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/commit/34679f674b7eefc22fe9bbc788390fff6c96fc46

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/commit/34679f674b7eefc22fe9bbc788390fff6c96fc46
You're receiving this email because of your account on salsa.debian.org.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20190420/d66ecb7a/attachment-0001.html>