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

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)

pkg.in/groups/server-v/zfs.directory

-[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

pkg.in/lists/virt/base.pkgs

@@ -22,3 +22,5 @@ lsof
 ethtool
 python3
 systemd-container
+zfs-utils
+kernel-modules-zfs-std-def

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

pkg.in/lists/virt/pve

@@ -24,4 +24,3 @@ dhcpcd
 faketime
 tzdata
 postfix
-kernel-modules-zfs-std-def