From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 31 Jul 2023 13:43:47 +0000 (+0000)
Subject: udev: Drop hwrng rules
X-Git-Tag: v2.27-core177~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=91443f923429d41c79a850295796ccaf1cd8ec4b;p=ipfire-2.x.git

udev: Drop hwrng rules

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>
---

diff --git a/config/rootfiles/common/udev b/config/rootfiles/common/udev
index a34ee46c32..5cd9e077f4 100644
--- a/config/rootfiles/common/udev
+++ b/config/rootfiles/common/udev
@@ -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
diff --git a/config/rootfiles/core/177/update.sh b/config/rootfiles/core/177/update.sh
index b2af611c19..2ab1568b9d 100644
--- a/config/rootfiles/core/177/update.sh
+++ b/config/rootfiles/core/177/update.sh
@@ -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
diff --git a/config/udev/90-hwrng.rules b/config/udev/90-hwrng.rules
deleted file mode 100644
index cbc555c110..0000000000
--- a/config/udev/90-hwrng.rules
+++ /dev/null
@@ -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"
diff --git a/lfs/rng-tools b/lfs/rng-tools
index c3f1e205cd..fb0d729e3a 100644
--- a/lfs/rng-tools
+++ b/lfs/rng-tools
@@ -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       =
 
diff --git a/lfs/udev b/lfs/udev
index e712ef6ea0..8f3ce42512 100644
--- a/lfs/udev
+++ b/lfs/udev
@@ -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
diff --git a/src/initscripts/packages/rngd b/src/initscripts/packages/rngd
index ba3e72d3ab..61e2821aa6 100644
--- a/src/initscripts/packages/rngd
+++ b/src/initscripts/packages/rngd
@@ -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