From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH] random: Drop busy-loop script Date: Wed, 03 Jun 2020 15:46:44 +0000 Message-ID: <20200603154644.14287-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0653735760713520984==" List-Id: --===============0653735760713520984== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 --- 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/c= ommon/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/comm= on/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/co= mmon/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=3D$( /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 --=20 2.20.1 --===============0653735760713520984==--