diff options
author | Ermal <eri@pfsense.org> | 2011-03-02 00:21:26 +0000 |
---|---|---|
committer | Ermal <eri@pfsense.org> | 2011-03-02 00:21:26 +0000 |
commit | dcc897e5b3cbadab1732d504d12512291af713ce (patch) | |
tree | cbf652e9848fc6b291b1e41f00a74eddc1ecebbd /etc/inc/services.inc | |
parent | 88cbd62a8261e20b6ce741fbb7a1f0d3872d6f0c (diff) | |
download | pfsense-dcc897e5b3cbadab1732d504d12512291af713ce.zip pfsense-dcc897e5b3cbadab1732d504d12512291af713ce.tar.gz |
Since its only called during bootup there is no need to do conditionals here. Always sync config and start the miniupnpd process.
Diffstat (limited to 'etc/inc/services.inc')
-rw-r--r-- | etc/inc/services.inc | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/etc/inc/services.inc b/etc/inc/services.inc index c01d97d..1a03021 100644 --- a/etc/inc/services.inc +++ b/etc/inc/services.inc @@ -1321,21 +1321,16 @@ function upnp_action ($action) { } function upnp_start() { - global $config, $g; + global $config; if(!isset($config['installedpackages']['miniupnpd']['config'])) return; if($config['installedpackages']['miniupnpd']['config'][0]['enable']) { - if($g['booting']) { - echo "Starting UPnP service... "; - require_once('/usr/local/pkg/miniupnpd.inc'); - sync_package_miniupnpd(); - echo "done.\n"; - } - else { - upnp_action('start'); - } + echo "Starting UPnP service... "; + require_once('/usr/local/pkg/miniupnpd.inc'); + sync_package_miniupnpd(); + echo "done.\n"; } } |