Fix installation of extra packages at build time relaxing check for running PHP instance and moving it to the top before any require_once() attempt runs

1 files changed, 5 insertions, 5 deletions

diff --git a/src/etc/rc.packages b/src/etc/rc.packages
index b0f37b3..8a6f886 100755
--- a/src/etc/rc.packages
+++ b/src/etc/rc.packages
@@ -20,6 +20,11 @@
  * limitations under the License.
  */
 
+/* If PHP is not running, silently abort and run registration during boot */
+if (!file_exists('/var/run/php-fpm.pid')) {
+	exit;
+}
+
 require_once("config.inc");
 require_once("functions.inc");
 require_once("filter.inc");
@@ -41,11 +46,6 @@ if ($argc == 1) {
 	exit;
 }
 
-/* If PHP is not running, silently abort and run registration during boot */
-if (!isvalidpid('/var/run/php-fpm.pid')) {
-	exit;
-}
-
 $pkg = '';
 $when = '';