From 371d168beaa036d0478282bef2d965149ed05217 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Sun, 16 Sep 2018 23:29:27 +0200 Subject: [PATCH] net/upnp: follow firmware-product changes in core --- net/upnp/Makefile | 2 +- net/upnp/src/etc/inc/plugins.inc.d/miniupnpd.inc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/upnp/Makefile b/net/upnp/Makefile index 9bdb9e7d4..3ce82b5ea 100644 --- a/net/upnp/Makefile +++ b/net/upnp/Makefile @@ -1,6 +1,6 @@ PLUGIN_NAME= upnp PLUGIN_VERSION= 1.2 -PLUGIN_REVISION= 1 +PLUGIN_REVISION= 2 PLUGIN_DEPENDS= miniupnpd PLUGIN_COMMENT= Universal Plug and Play Service PLUGIN_MAINTAINER= franco@opnsense.org diff --git a/net/upnp/src/etc/inc/plugins.inc.d/miniupnpd.inc b/net/upnp/src/etc/inc/plugins.inc.d/miniupnpd.inc index 766b8db6f..bb0e88ba0 100644 --- a/net/upnp/src/etc/inc/plugins.inc.d/miniupnpd.inc +++ b/net/upnp/src/etc/inc/plugins.inc.d/miniupnpd.inc @@ -98,7 +98,7 @@ function miniupnpd_uuid() function miniupnpd_configure_do($verbose = false) { - global $config; + global $config, $g; miniupnpd_stop(); @@ -194,7 +194,7 @@ function miniupnpd_configure_do($verbose = false) $config_text .= "serial=".strtoupper(substr(miniupnpd_uuid(), 0, 8))."\n"; /* set model number */ - $config_text .= "model_number=".file_get_contents("/usr/local/opnsense/version/opnsense")."\n"; + $config_text .= "model_number={$g['product_version']}\n"; /* upnp access restrictions */ for ($i=1; $i<=4; $i++) {