From 2780cb4c84aa36fd290fc01b55697e47edd99435 Mon Sep 17 00:00:00 2001
From: Jan Pavlinec <jan.pavlinec@nic.cz>
Date: Fri, 11 Jan 2019 12:51:07 +0100
Subject: [PATCH] lists/3g: create 3g list form netutils
---
lists/{netutils.lua.m4 => 3g.lua.m4} | 8 --------
lists/base.lua.m4 | 3 +++
lists/openvpn.lua.m4 | 2 ++
lists/terminal-apps.lua | 2 +-
4 files changed, 6 insertions(+), 9 deletions(-)
rename lists/{netutils.lua.m4 => 3g.lua.m4} (66%)
diff --git a/lists/netutils.lua.m4 b/lists/3g.lua.m4
similarity index 66%
rename from lists/netutils.lua.m4
rename to lists/3g.lua.m4
index 257430f05..183081bf4 100644
--- a/lists/netutils.lua.m4
+++ b/lists/3g.lua.m4
@@ -1,19 +1,11 @@
include(utils.m4)dnl Include utility macros
_FEATURE_GUARD_
--- Tools
-Install("tcpdump", { priority = 40 })
-Install("relayd", { priority = 40 })
-Install("openvpn-openssl", { priority = 40 })
-
-- 3G
Install("br2684ctl", "comgt", "uqmi", { priority = 40 })
Install("ppp-mod-pppoe", "pptpd", { priority = 40 })
Install("usb-modeswitch", { priority = 40 })
--- IPv6
-Install("ds-lite", "6in4", "6rd", "6to4", { priority = 40 })
-
-- Kernel
forInstall(kmod,nf-nathelper-extra,usb-net-rndis,usb-net-qmi-wwan,usb-serial-option)
diff --git a/lists/base.lua.m4 b/lists/base.lua.m4
index 5e38a24e4..8dd61d3c0 100644
--- a/lists/base.lua.m4
+++ b/lists/base.lua.m4
@@ -6,6 +6,9 @@ include(luci.lua.m4)
include(foris.lua)
include(terminal-apps.lua)
+-- IPv6
+Install("ds-lite", "6in4", "6rd", "6to4", { priority = 40 })
+
_END_FEATURE_GUARD_
--[[
diff --git a/lists/openvpn.lua.m4 b/lists/openvpn.lua.m4
index 111c1e6d1..fa6bf6ddc 100644
--- a/lists/openvpn.lua.m4
+++ b/lists/openvpn.lua.m4
@@ -1,6 +1,8 @@
include(utils.m4)dnl Include utility macros
_FEATURE_GUARD_
+Install("openvpn-openssl", { priority = 40 })
+
Install("foris-openvpn-plugin", "dhparam", { priority = 40 })
if for_l10n then
for_l10n("foris-openvpn-plugin-l10n-")
diff --git a/lists/terminal-apps.lua b/lists/terminal-apps.lua
index 4348ffaac..a59e49583 100644
--- a/lists/terminal-apps.lua
+++ b/lists/terminal-apps.lua
@@ -1,3 +1,3 @@
-- Terminal tools
-Install("bash", "coreutils", "diffutils", "htop", "curl", "vim-full", "terminfo", "psmisc", "procps-ng-top", "procps-ng-ps", { priority = 40 })
+Install("bash", "coreutils", "diffutils", "htop", "curl", "vim-full", "terminfo", "psmisc", "procps-ng-top", "procps-ng-ps", "tcpdump", { priority = 40 })
--
GitLab