From 62878b3535b2d6955d433746b97bcf586f15f313 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Tue, 10 Jul 2018 20:31:00 +0200
Subject: [PATCH] Firewall/alias, finish migration for
 https://github.com/opnsense/core/issues/1858

---
 .../models/OPNsense/Firewall/Migrations/M1_0_0.php   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/opnsense/mvc/app/models/OPNsense/Firewall/Migrations/M1_0_0.php b/src/opnsense/mvc/app/models/OPNsense/Firewall/Migrations/M1_0_0.php
index 9f2a9999c..b4b0b9ae1 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Firewall/Migrations/M1_0_0.php
+++ b/src/opnsense/mvc/app/models/OPNsense/Firewall/Migrations/M1_0_0.php
@@ -76,8 +76,16 @@ class M1_0_0 extends BaseModelMigration
                     $node->proto = (string)$alias->proto;
                 }
             }
-            // cleanup old config
-            //unset($cfgObj->aliases);
         }
     }
+
+    /**
+     * cleanup old config after config save, we need the old data to avoid race conditions in validations
+     * @param $model
+     */
+    public function post($model)
+    {
+        $cfgObj = Config::getInstance()->object();
+        unset($cfgObj->aliases);
+    }
 }