* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. b55842c26a94e9ff42d4f9010bdfcc51cd311dea
@ 2022-06-29 20:13 Peter Müller
0 siblings, 0 replies; only message in thread
From: Peter Müller @ 2022-06-29 20:13 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 7934 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via b55842c26a94e9ff42d4f9010bdfcc51cd311dea (commit)
via 255873a5f9a564036092a20e4bec7f4965cbd149 (commit)
from 5086ed681da4784474f0f71aaa70ec1d4940897c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b55842c26a94e9ff42d4f9010bdfcc51cd311dea
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Wed Jun 29 20:13:11 2022 +0000
Core Update 169: Delete "random" initscript
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 255873a5f9a564036092a20e4bec7f4965cbd149
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Jun 29 18:32:17 2022 +0000
random: Drop busy-loop script
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>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/aarch64/initscripts | 2 --
config/rootfiles/common/armv6l/initscripts | 2 --
config/rootfiles/common/x86_64/initscripts | 2 --
config/rootfiles/core/169/update.sh | 2 ++
lfs/initscripts | 1 -
src/initscripts/system/random | 51 -----------------------------
6 files changed, 2 insertions(+), 58 deletions(-)
delete mode 100644 src/initscripts/system/random
Difference in files:
diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts
index 4e607012a..d0c01c006 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
@@ -187,7 +186,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/armv6l/initscripts b/config/rootfiles/common/armv6l/initscripts
index 4e607012a..d0c01c006 100644
--- a/config/rootfiles/common/armv6l/initscripts
+++ b/config/rootfiles/common/armv6l/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
@@ -187,7 +186,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/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts
index dba397e73..628b59969 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
@@ -186,7 +185,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/core/169/update.sh b/config/rootfiles/core/169/update.sh
index abca6c336..8af8120ce 100644
--- a/config/rootfiles/core/169/update.sh
+++ b/config/rootfiles/core/169/update.sh
@@ -88,6 +88,8 @@ rm -rvf \
# Remove files
rm -rvf \
+ /etc/rc.d/init.d/random \
+ /etc/rc.d/rcsysinit.d/S66random \
/lib/firmware/ath10k/QCA99X0/hw2.0/board.bin \
/lib/firmware/intel/ice/ddp/ice-1.3.26.0.pkg \
/lib/firmware/iwlwifi-3160-10.ucode \
diff --git a/lfs/initscripts b/lfs/initscripts
index 97220cd4d..c6a5f3835 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 60b508738..000000000
--- a/src/initscripts/system/random
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> #
-# #
-# This program is free software: you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation, either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# This program is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with this program. If not, see <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-. /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
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-06-29 20:13 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-29 20:13 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. b55842c26a94e9ff42d4f9010bdfcc51cd311dea Peter Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox