conf.d, workstation/live.pkgs: use/volumes/regular

conf.d/e2k.mk

@@ -58,7 +58,7 @@ distro/e2k-101-rescue: distro/.e2k-rescue
 # (that's to be done downstream)
 distro/.e2k-installer-base: distro/.base mixin/e2k-base \
 	use/install2 use/install2/packages use/e2k/install2 \
-	use/net-ssh +net-eth
+	use/volumes/regular use/net-ssh +net-eth
 	@$(call set,INSTALLER,altlinux-generic)
 	@$(call set,META_PUBLISHER,BaseALT Ltd)
 	@$(call set,META_VOL_SET,ALT)
@@ -66,7 +66,6 @@ distro/.e2k-installer-base: distro/.base mixin/e2k-base \
 	@$(call set,META_APP_ID,ALT/$(ARCH))
 	@$(call add,INSTALL2_PACKAGES,agetty)
 	@$(call add,INSTALL2_PACKAGES,ifplugd) ### for net-eth link status
-	@$(call add,INSTALL2_PACKAGES,volumes-profile-regular)
 	@$(call add,INSTALL2_BRANDING,alterator)
 	@$(call add,THE_PACKAGES,agetty gpm fdisk parted smartmontools pv sshfs)
 	@$(call add,THE_PACKAGES,make-initrd dhcpcd hdparm nfs-clients vim-console)

conf.d/mixin-basealt.mk

@@ -10,7 +10,8 @@ mixin/alt-workstation: +installer +systemd +pulse +nm \
 	use/kernel/net use/l10n/default/ru_RU \
 	use/x11/xorg use/x11-autostart use/x11/gtk/nm \
 	use/install2/fs use/install2/fat use/install2/vnc \
-	use/apt-conf/branch use/fonts/install2 \
+	use/apt-conf/branch use/volumes/regular \
+	use/fonts/install2 \
 	use/fonts/otf/adobe use/fonts/otf/mozilla \
 	use/fonts/ttf/google use/fonts/ttf/google/extra \
 	use/fonts/ttf/redhat use/fonts/ttf/ubuntu \
@@ -22,7 +23,6 @@ mixin/alt-workstation: +installer +systemd +pulse +nm \
 	@$(call add,STAGE1_MODLISTS,stage2-mmc)
 	@$(call set,INSTALLER,altlinux-desktop)
 	@$(call add,INSTALL2_PACKAGES,alterator-notes)
-	@$(call add,INSTALL2_PACKAGES,volumes-profile-regular)
 	@$(call add,INSTALL2_PACKAGES,fdisk)
 	@$(call add,COMMON_PACKAGES,vim-console)
 	@$(call add,MAIN_GROUPS,$(workstation_groups))

conf.d/regular.mk

@@ -13,9 +13,9 @@ distro/.regular-x11: distro/.regular-base +vmguest +wireless \
 	use/x11/amdgpu use/live/x11 use/live/install use/live/suspend \
 	use/live/repo use/live/rw use/luks use/x11/wacom use/ntp/client \
 	use/branding use/browser/firefox/live use/browser/firefox/i18n \
-	use/browser/firefox/h264 use/services/lvm2-disable
+	use/browser/firefox/h264 use/volumes/regular use/services/lvm2-disable
 	@$(call add,THE_PACKAGES,disable-usb-autosuspend)
-	@$(call add,LIVE_PACKAGES,volumes-profile-regular btrfs-progs)
+	@$(call add,LIVE_PACKAGES,btrfs-progs)
 	@$(call add,LIVE_LISTS,$(call tags,(base || desktop) && regular))
 	@$(call add,LIVE_LISTS,$(call tags,base rescue))
 	@$(call add,LIVE_PACKAGES,gpm livecd-install-apt-cache)
@@ -74,10 +74,9 @@ distro/.regular-jeos: distro/.regular-jeos-base \
 # NB:
 # - stock cleanup is not enough (or installer-common-stage3 deps soaring)
 distro/regular-jeos: distro/.regular-jeos use/cleanup/jeos/full \
-	use/install2/vmguest use/vmguest/base
+	use/volumes/jeos use/install2/vmguest use/vmguest/base
 	@$(call add,BASE_PACKAGES,nfs-utils gdisk)
 	@$(call add,MAIN_PACKAGES,firmware-linux)
-	@$(call add,INSTALL2_PACKAGES,volumes-profile-jeos)
 	@$(call add,CLEANUP_PACKAGES,libffi 'libltdl*')
 	@$(call add,CLEANUP_PACKAGES,bridge-utils)
 	@$(call add,DEFAULT_SERVICES_DISABLE,fbsetfont)

pkg.in/lists/workstation/live.pkgs

-volumes-profile-regular
 connector
 vlc
 luvcview@X86