From 03109d9cdec69d3c3f1d36aa39eeb4e863501bb0 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Sun, 15 Aug 2021 19:36:50 +0200
Subject: [PATCH 1/2] Ask for VPS provider in templates

---
 .github/ISSUE_TEMPLATE/help.md  | 1 +
 .github/ISSUE_TEMPLATE/issue.md | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/help.md b/.github/ISSUE_TEMPLATE/help.md
index 0ecec78c..f4d56394 100644
--- a/.github/ISSUE_TEMPLATE/help.md
+++ b/.github/ISSUE_TEMPLATE/help.md
@@ -18,6 +18,7 @@ labels: help wanted
 
   - OpenMPTCProuter version: <!--- (Last is not a version) -->
   - OpenMPTCProuter VPS version: <!--- (Last is not a version) -->
+  - OpenMPTCProuter VPS provider:
   - OpenMPTCProuter platform: <!--- (RPI2/RPI3/x86/x86_64) -->
 
 <!--- (please do not attach text files) -->
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/issue.md b/.github/ISSUE_TEMPLATE/issue.md
index 97ab9b3c..2716ec67 100644
--- a/.github/ISSUE_TEMPLATE/issue.md
+++ b/.github/ISSUE_TEMPLATE/issue.md
@@ -35,6 +35,7 @@ labels: bug
 
   - OpenMPTCProuter version: <!--- (Last is not a version) -->
   - OpenMPTCProuter VPS version: <!--- (Last is not a version) -->
+  - OpenMPTCProuter VPS provider:
   - OpenMPTCProuter platform: <!--- (RPI2/RPI3/x86/x86_64) -->
 
-<!--- (please do not attach text files) -->
\ No newline at end of file
+<!--- (please do not attach text files) -->

From ebe7f8b212b50d9eeb986f54fb54469efd2b689b Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Sun, 15 Aug 2021 19:37:35 +0200
Subject: [PATCH 2/2] Remove luci-proto-modemmanager if provided in feed

---
 build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.sh b/build.sh
index e322b171..eff2b257 100755
--- a/build.sh
+++ b/build.sh
@@ -452,6 +452,7 @@ cd "../.."
 rm -rf feeds/luci/modules/luci-mod-network
 [ -d feeds/${OMR_DIST}/luci-mod-status ] && rm -rf feeds/luci/modules/luci-mod-status
 [ -d feeds/${OMR_DIST}/luci-app-statistics ] && rm -rf feeds/luci/applications/luci-app-statistics
+[ -d feeds/${OMR_DIST}/luci-proto-modemmanager ] && rm -rf feeds/luci/protocols/luci-proto-modemmanager
 
 echo "Add Occitan translation support"
 if ! patch -Rf -N -p1 -s --dry-run < patches/luci-occitan.patch; then