From bad28afe70bbb55502cb604ec6941383054e7fe5 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 12 Jul 2022 20:39:58 +0200
Subject: [PATCH] system: render interfaces in convert_config() #5768

This brings it in line with migrations although both hinge on
the idea that rc.configure_firmware is called to execute this
code.  Both need a better integration but bringing them to the
same level seems to make the most sense.

After reboot the config is in a consistent state now too...

Remove previous plugins_interfaces() call and always use full
path to pluginctl like most spots already do.
---
 Makefile                                | 2 +-
 src/etc/inc/config.inc                  | 5 +++--
 src/etc/inc/plugins.inc.d/ntpd.inc      | 2 +-
 src/opnsense/scripts/firmware/check.sh  | 2 +-
 src/opnsense/scripts/firmware/update.sh | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index b707dc1d7..cb763abd9 100644
--- a/Makefile
+++ b/Makefile
@@ -350,7 +350,7 @@ upgrade-check:
 upgrade: upgrade-check clean-pkgdir package
 	@${PKG} delete -fy ${CORE_NAME} || true
 	@${PKG} add ${PKGDIR}/*.pkg
-	@pluginctl webgui
+	@${.CURDIR}/src/sbin/pluginctl webgui
 
 lint-shell:
 	@find ${.CURDIR}/src ${.CURDIR}/Scripts \
diff --git a/src/etc/inc/config.inc b/src/etc/inc/config.inc
index cf210f38c..19b511203 100644
--- a/src/etc/inc/config.inc
+++ b/src/etc/inc/config.inc
@@ -100,6 +100,9 @@ function convert_config($verbose = false)
         mwexecf($cmd);
     }
 
+    /* register pluggable interfaces */
+    mwexecf('/usr/local/sbin/pluginctl -i');
+
     /* factory reset on release type and plugins if necessary */
     $cmd = '/usr/local/opnsense/scripts/firmware/register.php resync_factory';
     if ($verbose) {
@@ -141,8 +144,6 @@ function write_config($desc = '', $backup = true)
         }
     }
 
-    plugins_interfaces();
-
     $cnf = OPNsense\Core\Config::getInstance();
     $cnf->fromArray($config);
     $revision_info = make_config_revision_entry($desc);
diff --git a/src/etc/inc/plugins.inc.d/ntpd.inc b/src/etc/inc/plugins.inc.d/ntpd.inc
index 3d4a64a9e..aae5f0801 100644
--- a/src/etc/inc/plugins.inc.d/ntpd.inc
+++ b/src/etc/inc/plugins.inc.d/ntpd.inc
@@ -76,7 +76,7 @@ function ntpd_cron()
     $jobs = array();
 
     if (ntpd_enabled() && !empty($config['ntpd']['clientmode'])) {
-        $jobs[]['autocron'] = array('pluginctl -s ntpd restart', '0', '2');
+        $jobs[]['autocron'] = ['/usr/local/sbin/pluginctl -s ntpd restart', '0', '2'];
     }
 
     return $jobs;
diff --git a/src/opnsense/scripts/firmware/check.sh b/src/opnsense/scripts/firmware/check.sh
index 3b3889a7a..0fe6f6833 100755
--- a/src/opnsense/scripts/firmware/check.sh
+++ b/src/opnsense/scripts/firmware/check.sh
@@ -64,7 +64,7 @@ repository="error"
 sets_upgraded=
 upgrade_needs_reboot="0"
 
-product_suffix="-$(pluginctl -g system.firmware.type)"
+product_suffix="-$(/usr/local/sbin/pluginctl -g system.firmware.type)"
 if [ "${product_suffix}" = "-" ]; then
     product_suffix=
 fi
diff --git a/src/opnsense/scripts/firmware/update.sh b/src/opnsense/scripts/firmware/update.sh
index 0d296f24c..061528532 100755
--- a/src/opnsense/scripts/firmware/update.sh
+++ b/src/opnsense/scripts/firmware/update.sh
@@ -45,7 +45,7 @@ if [ "$(opnsense-version -a)" != "$(opnsense-version -x)" ]; then
 fi
 
 # figure out the release type from config
-SUFFIX="-$(pluginctl -g system.firmware.type)"
+SUFFIX="-$(/usr/local/sbin/pluginctl -g system.firmware.type)"
 if [ "${SUFFIX}" = "-" ]; then
 	SUFFIX=
 fi