From 136c896577118f069b3837fe97daea97a7cf22a6 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 11 Jun 2015 16:26:14 +0200
Subject: [PATCH 1/2] firmware: better spot for reset on upgrade done

---
 src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt b/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt
index fcc47a5e1..fe5308672 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt
@@ -96,9 +96,9 @@ POSSIBILITY OF SUCH DAMAGE.
 
         ajaxCall('/api/core/firmware/upgrade',{upgrade:$.upgrade_action},function() {
             $("#upgrade_progress").removeClass("fa fa-spinner fa-pulse");
+            $('#updatelist').empty();
             setTimeout(trackStatus, 1000) ;
         });
-        $('#updatelist').empty();
     }
 
     /**

From b1afb97f4dff4c6cbb15cfba09f823c24f4ea35f Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 11 Jun 2015 16:35:52 +0200
Subject: [PATCH 2/2] system: no hay zmq

---
 src/etc/inc/system.inc | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc
index 5b1ddf346..aea192611 100644
--- a/src/etc/inc/system.inc
+++ b/src/etc/inc/system.inc
@@ -740,12 +740,6 @@ EOD;
 			$syslogconf .= system_syslogd_get_remote_servers($syslogcfg, "*.*");
 		}
 
-		if (isset($syslogcfg['zmqserver'])) {
-				$syslogconf .= <<<EOD
-*.*								^{$syslogcfg['zmqserver']}
-
-EOD;
-		}
 		/* write syslog.conf */
 		if (!@file_put_contents("/var/etc/syslog.conf", $syslogconf)) {
 			printf(gettext("Error: cannot open syslog.conf in system_syslogd_start().%s"), "\n");