webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

udev: Drop hwrng rules

Browse Source 
This is another fragment of rngd - the gift that keeps giving.

The udev rules file contains a lot of stuff for a prototype which never
went into production. So, that can be dropped.

It would have been left with one rule that starts rngd whenever a HWRNG
is being found. That is however no longer needed as rngd is being
started in the init process. We no longer need to initialize it as early
as possible to seed the kernel's PRNG.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2023-07-31 13:43:47 +00:00
parent b1110eb1bd
commit 91443f9234
6 changed files with 3 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/common/udev
View File

@@ -72,7 +72,6 @@ lib/udev/rules.d/75-net-description.rules
lib/udev/rules.d/75-probe_mtd.rules
lib/udev/rules.d/78-sound-card.rules
lib/udev/rules.d/80-drivers.rules
lib/udev/rules.d/90-hwrng.rules
lib/udev/rules.d/99-aqm.rules
lib/udev/rules.d/99-offloading.rules
lib/udev/scsi_id

1
config/rootfiles/core/177/update.sh
View File

@@ -105,6 +105,7 @@ if [ ! -e "/opt/pakfire/db/installed/meta-rng-tools" ]; then
/etc/rc.d/init.d/rngd \
/etc/rc.d/rc*.d/*rngd
fi
rm -vf /lib/udev/rules.d/90-hwrng.rules
# Extract files
extract_files

16
config/udev/90-hwrng.rules
View File

@@ -1,16 +0,0 @@
# do not edit this file, it will be overwritten on update
SUBSYSTEM!="tty", GOTO="ipfire_hwrng_end"
KERNEL!="ttyACM[0-9]*", GOTO="ipfire_hwrng_end"
SUBSYSTEMS=="usb-serial", ENV{.ID_PORT}="$attr{port_number}"
IMPORT{builtin}="usb_id"
ENV{ID_SERIAL}=="", GOTO="ipfire_hwrng_end"
SUBSYSTEMS=="usb", ENV{ID_USB_INTERFACE_NUM}="$attr{bInterfaceNumber}"
ENV{ID_USB_INTERFACE_NUM}=="", GOTO="ipfire_hwrng_end"
ATTRS{manufacturer}=="IPFire.org", ATTRS{product}=="Random Number Generator*", ENV{.ID_PORT}=="", SYMLINK+="hwrngtty" RUN+="/bin/stty raw -echo -ixoff -F /dev/hwrngtty 115200" RUN+="/etc/rc.d/init.d/rngd udev-event"
LABEL="ipfire_hwrng_end"
ACTION=="add|remove", KERNEL=="hw_random", RUN+="/etc/rc.d/init.d/rngd udev-event"

2
lfs/rng-tools
View File

@@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = rng-tools
PAK_VER = 3
PAK_VER = 4
DEPS =

4
lfs/udev
View File

@@ -122,10 +122,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
install -v -m 644 $(DIR_SRC)/config/udev/60-net.rules \
/lib/udev/rules.d
# Install hwrng rules.
install -v -m 644 $(DIR_SRC)/config/udev/90-hwrng.rules \
/lib/udev/rules.d
# Install AQM rules
install -v -m 644 $(DIR_SRC)/config/udev/99-aqm.rules \
/lib/udev/rules.d

16
src/initscripts/packages/rngd
View File

@@ -24,18 +24,8 @@
case "${1}" in
start)
if pidofproc -s /usr/sbin/rngd; then
boot_mesg "Random Number Generator Daemon is already running..."
echo_ok;
exit 0
fi
if [ -e /dev/hwrngtty ]; then
HWRNG=/dev/hwrngtty
else
HWRNG=/dev/hwrng
fi
boot_mesg "Starting Random Number Generator Daemon..."
loadproc /usr/sbin/rngd -r $HWRNG --quiet
loadproc /usr/sbin/rngd --quiet
;;
stop)
@@ -53,10 +43,6 @@ case "${1}" in
statusproc /usr/sbin/rngd
;;
udev-event)
$0 restart &>/dev/null
;;
*)
echo "Usage: ${0} {start|stop|restart|status}"
exit 1