server-v.mk, lists/virt: Drop zfs group; install zfs support by default

2019-07-10 14:13:33 +03:00 · 2019-07-10 14:13:33 +03:00 · 0e3abf21c4
commit 0e3abf21c4
parent 319290a55d
5 changed files with 3 additions and 11 deletions
--- a/conf.d/server-v.mk
+++ b/conf.d/server-v.mk
@ -72,7 +72,6 @@ distro/server-v: distro/.server-v-base \
 	@$(call add,SYSTEM_PACKAGES,mdadm-tool lvm2 multipath-tools vdo)
 	@$(call add,BASE_KMODULES,ipset kvm xtables-addons kvdo)
 	@$(call add,BASE_LISTS,virt/base.pkgs)
-	@$(call add,MAIN_GROUPS,server-v/zfs)
 	@$(call add,MAIN_GROUPS,server-v/10-basic server-v/kvm)
 	@$(call add,MAIN_GROUPS,server-v/11-cockpit $(cockpit))
 	@$(call add,MAIN_GROUPS,server-v/20-pve server-v/pve)
--- a/pkg.in/groups/server-v/zfs.directory
+++ b/pkg.in/groups/server-v/zfs.directory
@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Directory
-Name=ZFS management utilities
-Name[ru_RU]=Утилиты управления ZFS
-X-Alterator-PackageList=storage/zfs
-X-Alterator-Conflicts=server-v/20-pve
-X-Alterator-Required=no
-X-Alterator-Parent=server-v/70-storage
--- a/pkg.in/lists/virt/base.pkgs
+++ b/pkg.in/lists/virt/base.pkgs
@ -22,3 +22,5 @@ lsof
 ethtool
 python3
 systemd-container
+zfs-utils
+kernel-modules-zfs-std-def
--- a/pkg.in/lists/virt/kvm
+++ b/pkg.in/lists/virt/kvm
@ -7,6 +7,7 @@ libvirt-daemon-driver-storage-scsi
 libvirt-daemon-driver-storage-iscsi-direct
 libvirt-daemon-driver-storage-mpath
 libvirt-daemon-driver-storage-rbd
+libvirt-daemon-driver-storage-zfs
 libvirt-daemon-driver-interface
 libvirt-daemon-driver-network
 libvirt-daemon-driver-nodedev
--- a/pkg.in/lists/virt/pve
+++ b/pkg.in/lists/virt/pve
@ -24,4 +24,3 @@ dhcpcd
 faketime
 tzdata
 postfix
-kernel-modules-zfs-std-def