Correctly move upnp to base since LiveCD cannot write files to /usr/local/etc or /usr/local/etc/rc.d/ Ticket #1342

2 files changed, 8 insertions, 0 deletions

diff --git a/etc/inc/services.inc b/etc/inc/services.inc
index c268f98..4bc0d1f 100644
--- a/etc/inc/services.inc
+++ b/etc/inc/services.inc
@@ -1272,4 +1272,10 @@ function configure_cron() {
 		conf_mount_ro();
 }
 
+function upnp_start() {
+	if($config['installedpackages']['miniupnpd']['config'][0]["enable"]) {
+		mwexec_bg("/usr/local/sbin/miniupnpd -f /var/etc/miniupnpd.conf");
+	}
+}
+
 ?>
\ No newline at end of file
diff --git a/etc/rc.bootup b/etc/rc.bootup
index 7a00960..7d1bafd 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -317,6 +317,8 @@
 		mwexec("sysctl net.inet.tcp.sendspace=4096");
 	}
 
+	upnp_start();
+
 	/* done */
 	unlink("{$g['varrun_path']}/booting");
 	$g['booting'] = FALSE;