From de5ebfa44ce61c0cc7e90d988a0d45bc9ee28455 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 14 Aug 2020 21:02:55 +0200
Subject: [PATCH] gluon-core: run firewall upgrade script after basic network
 setup (#2091)

Reorder scripts so that the mesh_lan interface is accounted for.

Two other firewall upgrade scripts (mesh-babel and l3roamd) are
reordered as well. While there seems to be no hard dependency at the
moment, it makes sense to run the basic setup first, also to avoid
problems with future changes.

Closes: #2090
Fixes: ed094bc68c7c ("gluon-core: firewall: Allow custom gluon_wired interfaces (#2041)")
---
 .../lib/gluon/upgrade/{140-firewall-rules => 300-firewall-rules}  | 0
 .../gluon/upgrade/{150-firewall-l3roamd => 320-firewall-l3roamd}  | 0
 ...40-gluon-mesh-babel-firewall => 310-gluon-mesh-babel-firewall} | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename package/gluon-core/luasrc/lib/gluon/upgrade/{140-firewall-rules => 300-firewall-rules} (100%)
 rename package/gluon-l3roamd/luasrc/lib/gluon/upgrade/{150-firewall-l3roamd => 320-firewall-l3roamd} (100%)
 rename package/gluon-mesh-babel/luasrc/lib/gluon/upgrade/{140-gluon-mesh-babel-firewall => 310-gluon-mesh-babel-firewall} (100%)

diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/140-firewall-rules b/package/gluon-core/luasrc/lib/gluon/upgrade/300-firewall-rules
similarity index 100%
rename from package/gluon-core/luasrc/lib/gluon/upgrade/140-firewall-rules
rename to package/gluon-core/luasrc/lib/gluon/upgrade/300-firewall-rules
diff --git a/package/gluon-l3roamd/luasrc/lib/gluon/upgrade/150-firewall-l3roamd b/package/gluon-l3roamd/luasrc/lib/gluon/upgrade/320-firewall-l3roamd
similarity index 100%
rename from package/gluon-l3roamd/luasrc/lib/gluon/upgrade/150-firewall-l3roamd
rename to package/gluon-l3roamd/luasrc/lib/gluon/upgrade/320-firewall-l3roamd
diff --git a/package/gluon-mesh-babel/luasrc/lib/gluon/upgrade/140-gluon-mesh-babel-firewall b/package/gluon-mesh-babel/luasrc/lib/gluon/upgrade/310-gluon-mesh-babel-firewall
similarity index 100%
rename from package/gluon-mesh-babel/luasrc/lib/gluon/upgrade/140-gluon-mesh-babel-firewall
rename to package/gluon-mesh-babel/luasrc/lib/gluon/upgrade/310-gluon-mesh-babel-firewall
-- 
GitLab