Commit 34679f67 authored by Holger Levsen's avatar Holger Levsen
Browse files

Drop obsolete code in d-i/finish-install now that d-i uses haveged (via a...


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: default avatarHolger Levsen <holger@layer-acht.org>
parent 67523c30
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
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@debian.org>  Sat, 20 Apr 2019 07:53:26 +0200

+0 −25
Original line number Diff line number Diff line
@@ -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