diff options
| author | Brooks Davis <brooks@FreeBSD.org> | 2004-04-15 18:23:14 +0000 |
|---|---|---|
| committer | Brooks Davis <brooks@FreeBSD.org> | 2004-04-15 18:23:14 +0000 |
| commit | 21462105ebf6fe900f1a5bf2c93d16de2e1eb7c5 (patch) | |
| tree | 837c94918007d8cd32c32b2d10d0689ee5317275 /etc | |
| parent | 6ea20e1c98690114641475be12e9e58534830860 (diff) | |
| download | src-21462105ebf6fe900f1a5bf2c93d16de2e1eb7c5.tar.gz src-21462105ebf6fe900f1a5bf2c93d16de2e1eb7c5.zip | |
Remove bogus checks on the value of ${entropy_file} and hardcode out
entropy source to /entropy. We have to assume there is no rc.conf at
this stage of the boot process.
Reported by: njl
Notes
Notes:
svn path=/head/; revision=128287
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/rc.d/preseedrandom | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/etc/rc.d/preseedrandom b/etc/rc.d/preseedrandom index ecbfc3cc525b..14b2378a9ca0 100644 --- a/etc/rc.d/preseedrandom +++ b/etc/rc.d/preseedrandom @@ -13,8 +13,6 @@ feed_dev_random() fi } -entropy_file="/entropy" - soft_random_generator=`sysctl kern.random 2>/dev/null` if [ -n "${soft_random_generator}" ] ; then @@ -31,15 +29,9 @@ if [ -n "${soft_random_generator}" ] ; then # First pass at reseeding /dev/random. # - case ${entropy_file} in - [Nn][Oo] | '') - ;; - *) - if [ -w /dev/random ]; then - feed_dev_random "${entropy_file}" - fi - ;; - esac + if [ -w /dev/random ]; then + feed_dev_random "/entropy" + fi echo -n ' kickstart' |