From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 6 Dec 2018 21:33:05 +0000 (+0100)
Subject: rngd: update initskript and add hwrngtty support
X-Git-Tag: v2.21-core126~6
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=56726ed954bf1aa1f52214251eb42a7ab478e925;hp=8d638b63f8bf08ee8869ed58734aabe96f8ffdc5

rngd: update initskript and add hwrngtty support

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/config/rootfiles/core/126/filelists/files b/config/rootfiles/core/126/filelists/files
index ce4e517681..90534d7258 100644
--- a/config/rootfiles/core/126/filelists/files
+++ b/config/rootfiles/core/126/filelists/files
@@ -1,4 +1,6 @@
 etc/system-release
 etc/issue
+etc/rc.d/init.d/rngd
+lib/udev/rules.d/90-hwrng.rules
 srv/web/ipfire/cgi-bin/credits.cgi
 var/ipfire/langs
diff --git a/config/udev/90-hwrng.rules b/config/udev/90-hwrng.rules
index a939790091..cbc555c110 100644
--- a/config/udev/90-hwrng.rules
+++ b/config/udev/90-hwrng.rules
@@ -1 +1,16 @@
+# 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/src/initscripts/system/rngd b/src/initscripts/system/rngd
index 91b70a7b4f..0f95fde80a 100644
--- a/src/initscripts/system/rngd
+++ b/src/initscripts/system/rngd
@@ -13,8 +13,18 @@
 
 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 --quiet
+		loadproc /usr/sbin/rngd -r $HWRNG --quiet
 		;;
 
 	stop)