From mboxrd@z Thu Jan  1 00:00:00 1970
From: Peter =?utf-8?q?M=C3=BCller?= <peter.mueller@link38.eu>
To: development@lists.ipfire.org
Subject: [PATCH v2] show RNGD status at WebUI service page, too
Date: Sun, 03 Dec 2017 18:27:46 +0100
Message-ID: <20171203182746.47ff6a10.peter.mueller@link38.eu>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0908684795377311244=="
List-Id: <development.lists.ipfire.org>

--===============0908684795377311244==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Also show the status of the hardware random number generator ("RNGD")
at the services.cgi page in the WebUI. Before, this was only shown
at the entropy.cgi page, which was a bit inconsistent.

Signed-off-by: Peter M=C3=BCller <peter.mueller(a)link38.eu>
---
 html/cgi-bin/services.cgi   | 4 +++-
 src/initscripts/system/rngd | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
index 64fdbba05..eaaa5298a 100644
--- a/html/cgi-bin/services.cgi
+++ b/html/cgi-bin/services.cgi
@@ -56,6 +56,7 @@ my %servicenames =3D(
 	$Lang::tr{'secure shell server'} =3D> 'sshd',
 	$Lang::tr{'vpn'} =3D> 'charon',
 	$Lang::tr{'web proxy'} =3D> 'squid',
+	$Lang::tr{'random number generator daemon'} =3D> 'rngd',
 	'OpenVPN' =3D> 'openvpn'
 );
=20
@@ -74,7 +75,8 @@ my %link =3D(
 	"$Lang::tr{'intrusion detection system'} (GREEN)" =3D> "<a href=3D\'ids.cgi=
\'>$Lang::tr{'intrusion detection system'} (GREEN)</a>",
 	"$Lang::tr{'intrusion detection system'} (RED)" =3D> "<a href=3D\'ids.cgi\'=
>$Lang::tr{'intrusion detection system'} (RED)</a>",
 	"$Lang::tr{'intrusion detection system'} (ORANGE)" =3D> "<a href=3D\'ids.cg=
i\'>$Lang::tr{'intrusion detection system'} (ORANGE)</a>",
-	"$Lang::tr{'intrusion detection system'} (BLUE)" =3D> "<a href=3D\'ids.cgi\=
'>$Lang::tr{'intrusion detection system'} (BLUE)</a>"
+	"$Lang::tr{'intrusion detection system'} (BLUE)" =3D> "<a href=3D\'ids.cgi\=
'>$Lang::tr{'intrusion detection system'} (BLUE)</a>",
+	"$Lang::tr{'random number generator daemon'}" =3D> "<a href=3D\'entropy.cgi=
\'>$Lang::tr{'random number generator daemon'}</a>"
 );
=20
 my $lines=3D0; # Used to count the outputlines to make different bgcolor
diff --git a/src/initscripts/system/rngd b/src/initscripts/system/rngd
index df4aa7da2..9abcf6a79 100644
--- a/src/initscripts/system/rngd
+++ b/src/initscripts/system/rngd
@@ -30,10 +30,16 @@ case "${1}" in
 		boot_mesg "Starting Random Number Generator Daemon..."
=20
 		if pidofproc /usr/sbin/rngd &>/dev/null; then
+			# Make sure PID file is readable.
+			test -f /run/rngd.pid && chmod 755 /run/rngd.pid
+
 			# Is already running.
 			echo_ok
 		else
 			loadproc /usr/sbin/rngd --no-tpm=3D1
+
+			# Make sure PID file is readable.
+			test -f /run/rngd.pid && chmod 755 /run/rngd.pid
 		fi
 		;;
=20
--=20
2.13.6



--===============0908684795377311244==--