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] show RNGD status at WebUI service page, too
Date: Fri, 08 Sep 2017 20:27:27 +0200
Message-ID: <20170908202727.58c12115.peter.mueller@link38.eu>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1031289894639219779=="
List-Id: <development.lists.ipfire.org>

--===============1031289894639219779==
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>
---
diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
index 64fdbba05..6629ee006 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
@@ -327,3 +329,4 @@ sub isrunningaddon{
 	}
 	return $status;
 }
+
diff --git a/src/initscripts/system/rngd b/src/initscripts/system/rngd
index df4aa7da2..5cd3b53ec 100644
--- a/src/initscripts/system/rngd
+++ b/src/initscripts/system/rngd
@@ -34,6 +34,7 @@ case "${1}" in
 			echo_ok
 		else
 			loadproc /usr/sbin/rngd --no-tpm=3D1
+			test -f /run/rngd.pid && chmod 755 /run/rngd.pid
 		fi
 		;;
 =09

--===============1031289894639219779==--