From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] random: Drop busy-loop script
Date: Wed, 03 Jun 2020 15:46:44 +0000 [thread overview]
Message-ID: <20200603154644.14287-1-michael.tremer@ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 5332 bytes --]
This is no longer required because the kernel will now try to
generate some randomness in an easier way when needed.
This has been added in: b923dd3de0acbf415cee193191250347b733fab8
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
config/rootfiles/common/aarch64/initscripts | 2 --
config/rootfiles/common/armv5tel/initscripts | 2 --
config/rootfiles/common/i586/initscripts | 2 --
config/rootfiles/common/x86_64/initscripts | 2 --
lfs/initscripts | 1 -
src/initscripts/system/random | 33 --------------------
6 files changed, 42 deletions(-)
delete mode 100644 src/initscripts/system/random
diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts
index 8d945f7a5..485c0af6e 100644
--- a/config/rootfiles/common/aarch64/initscripts
+++ b/config/rootfiles/common/aarch64/initscripts
@@ -71,7 +71,6 @@ etc/rc.d/init.d/networking/wpa_supplicant.exe
etc/rc.d/init.d/ntp
etc/rc.d/init.d/pakfire
etc/rc.d/init.d/partresize
-etc/rc.d/init.d/random
etc/rc.d/init.d/rc
etc/rc.d/init.d/reboot
etc/rc.d/init.d/rngd
@@ -191,7 +190,6 @@ etc/rc.d/rcsysinit.d/S45udev_retry
etc/rc.d/rcsysinit.d/S50cleanfs
etc/rc.d/rcsysinit.d/S60setclock
etc/rc.d/rcsysinit.d/S65rngd
-etc/rc.d/rcsysinit.d/S66random
etc/rc.d/rcsysinit.d/S70console
etc/rc.d/rcsysinit.d/S71pakfire
etc/rc.d/rcsysinit.d/S73swconfig
diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts
index 8d945f7a5..485c0af6e 100644
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@ -71,7 +71,6 @@ etc/rc.d/init.d/networking/wpa_supplicant.exe
etc/rc.d/init.d/ntp
etc/rc.d/init.d/pakfire
etc/rc.d/init.d/partresize
-etc/rc.d/init.d/random
etc/rc.d/init.d/rc
etc/rc.d/init.d/reboot
etc/rc.d/init.d/rngd
@@ -191,7 +190,6 @@ etc/rc.d/rcsysinit.d/S45udev_retry
etc/rc.d/rcsysinit.d/S50cleanfs
etc/rc.d/rcsysinit.d/S60setclock
etc/rc.d/rcsysinit.d/S65rngd
-etc/rc.d/rcsysinit.d/S66random
etc/rc.d/rcsysinit.d/S70console
etc/rc.d/rcsysinit.d/S71pakfire
etc/rc.d/rcsysinit.d/S73swconfig
diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts
index 996925b7a..511692335 100644
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@ -71,7 +71,6 @@ etc/rc.d/init.d/networking/wpa_supplicant.exe
etc/rc.d/init.d/ntp
etc/rc.d/init.d/pakfire
etc/rc.d/init.d/partresize
-etc/rc.d/init.d/random
etc/rc.d/init.d/rc
etc/rc.d/init.d/reboot
etc/rc.d/init.d/rngd
@@ -190,7 +189,6 @@ etc/rc.d/rcsysinit.d/S45udev_retry
etc/rc.d/rcsysinit.d/S50cleanfs
etc/rc.d/rcsysinit.d/S60setclock
etc/rc.d/rcsysinit.d/S65rngd
-etc/rc.d/rcsysinit.d/S66random
etc/rc.d/rcsysinit.d/S70console
etc/rc.d/rcsysinit.d/S71pakfire
etc/rc.d/rcsysinit.d/S74cloud-init
diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts
index 996925b7a..511692335 100644
--- a/config/rootfiles/common/x86_64/initscripts
+++ b/config/rootfiles/common/x86_64/initscripts
@@ -71,7 +71,6 @@ etc/rc.d/init.d/networking/wpa_supplicant.exe
etc/rc.d/init.d/ntp
etc/rc.d/init.d/pakfire
etc/rc.d/init.d/partresize
-etc/rc.d/init.d/random
etc/rc.d/init.d/rc
etc/rc.d/init.d/reboot
etc/rc.d/init.d/rngd
@@ -190,7 +189,6 @@ etc/rc.d/rcsysinit.d/S45udev_retry
etc/rc.d/rcsysinit.d/S50cleanfs
etc/rc.d/rcsysinit.d/S60setclock
etc/rc.d/rcsysinit.d/S65rngd
-etc/rc.d/rcsysinit.d/S66random
etc/rc.d/rcsysinit.d/S70console
etc/rc.d/rcsysinit.d/S71pakfire
etc/rc.d/rcsysinit.d/S74cloud-init
diff --git a/lfs/initscripts b/lfs/initscripts
index 242de60e5..7d5f39716 100644
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -171,7 +171,6 @@ $(TARGET) :
ln -sf ../init.d/setclock /etc/rc.d/rc0.d/K47setclock
ln -sf ../init.d/setclock /etc/rc.d/rc6.d/K47setclock
ln -sf ../init.d/rngd /etc/rc.d/rcsysinit.d/S65rngd
- ln -sf ../init.d/random /etc/rc.d/rcsysinit.d/S66random
ln -sf ../init.d/console /etc/rc.d/rcsysinit.d/S70console
ln -sf ../init.d/pakfire /etc/rc.d/rcsysinit.d/S71pakfire
ln -sf ../init.d/cloud-init /etc/rc.d/rcsysinit.d/S74cloud-init
diff --git a/src/initscripts/system/random b/src/initscripts/system/random
deleted file mode 100644
index 489c7dac9..000000000
--- a/src/initscripts/system/random
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-. /etc/sysconfig/rc
-. $rc_functions
-
-if [ -e /proc/sys/kernel/random/poolsize ]; then
- poolsize=$(</proc/sys/kernel/random/poolsize);
- poolsize=$(expr $poolsize / 8 );
-else
- poolsize=512;
-fi
-
-case "$1" in
- start)
-
- #CRNG init need 128bit so wait until there is more)
- avail=$(</proc/sys/kernel/random/entropy_avail)
- while [ $avail -lt 130 ]; do
- avail=$(</proc/sys/kernel/random/entropy_avail)
- boot_mesg -n "\rWait for entropy: $avail/130 "
- # Generate some disc access to gather entropy
- echo avail > /var/tmp/random-tmpfile
- sync
- rm -f /var/tmp/random-tmpfile
- done;
- ;;
-
- *)
- echo "Usage: $0 {start}"
- exit 1
- ;;
-esac
-
-# End $rc_base/init.d/random
--
2.20.1
next reply other threads:[~2020-06-03 15:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-03 15:46 Michael Tremer [this message]
2022-06-29 18:32 Michael Tremer
2022-06-29 20:10 ` Peter Müller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200603154644.14287-1-michael.tremer@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox