From af850f24deabf1e03830318e4c6ebb760ec102ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Fri, 28 Jun 2019 11:15:07 +0200
Subject: [PATCH] lists: move storage plugin to base install
Storage plugin would be now part of three lists. I don't see a reason
why we should not move it to base install instead of installing it on
top of base system. It would be better to have it optional and to have
some dependencies but I think that as it is now it is confusing to user
that storage plugin disappears or appears out of kind of nowhere.
---
lists/foris.lua.m4 | 3 ++-
lists/pkglists/lxc.lua.m4 | 5 +++--
lists/pkglists/nas.lua.m4 | 1 -
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/lists/foris.lua.m4 b/lists/foris.lua.m4
index 558fd158e..d2edcafcc 100644
--- a/lists/foris.lua.m4
+++ b/lists/foris.lua.m4
@@ -1,10 +1,11 @@
include(utils.m4)dnl Include utility macros
_FEATURE_GUARD_
-Install("foris", "foris-diagnostics-plugin", "turris-webapps", "lighttpd-https-cert", { priority = 40 })
+Install("foris", "foris-diagnostics-plugin", "foris-storage-plugin", "turris-webapps", "lighttpd-https-cert", { priority = 40 })
if for_l10n then
for_l10n("foris-l10n-")
for_l10n("foris-diagnostics-plugin-l10n-")
+ for_l10n("foris-storage-plugin-l10n-")
for_l10n('pkglists-l10n-')
end
diff --git a/lists/pkglists/lxc.lua.m4 b/lists/pkglists/lxc.lua.m4
index 0e840a93f..001e2cb88 100644
--- a/lists/pkglists/lxc.lua.m4
+++ b/lists/pkglists/lxc.lua.m4
@@ -1,11 +1,12 @@
include(utils.m4)dnl Include utility macros
_FEATURE_GUARD_
-Install("kmod-veth", { priority = 40 })
Install("lxc", { priority = 40 })
forInstall(lxc,attach,auto,console,create,info,ls,monitor,monitord,snapshot,start,stop)
+
Install("luci-app-lxc", { priority = 40 })
-Install("foris-storage-plugin", { priority = 40 })
+
+Install("kmod-veth", { priority = 40 })
Install("gnupg", "gnupg-utils", "getopt", "tar", "wget", { priority = 40 })
_END_FEATURE_GUARD_
diff --git a/lists/pkglists/nas.lua.m4 b/lists/pkglists/nas.lua.m4
index 473d8e170..767757dee 100644
--- a/lists/pkglists/nas.lua.m4
+++ b/lists/pkglists/nas.lua.m4
@@ -23,7 +23,6 @@ Install("fdisk", "cfdisk", "hdparm", "resize2fs", "partx-utils", { priority = 40
Install("acl", "attr", { priority = 40 })
Install("blockd" , "smartd", "smartmontools", { priority = 40 })
Install("swap-utils", { priority = 40 })
-Install("foris-storage-plugin", { priority = 40 })
-- File systems
Install("lvm2", "mdadm", "dosfstools", "mkhfs", "btrfs-progs", "davfs2", "e2fsprogs", "fuse-utils", "xfs-mkfs", { priority = 40 })
--
GitLab