mixin.mk, regular.mk: use/volumes/regular for all Regulars

138d2cb2 · Anton Midyukov · 1a2af1ca · 138d2cb2 · 138d2cb2
Commit 138d2cb2 authored Sep 21, 2023 by Anton Midyukov
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

mixin.mk conf.d/mixin.mk +1 -1

regular.mk conf.d/regular.mk +1 -1

No files found.
--- a/conf.d/mixin.mk
+++ b/conf.d/mixin.mk
@@ -38,7 +38,7 @@ mixin/e2k-mate: use/e2k/x11 use/x11/xorg use/fonts/install2 \
 	@$(call add,THE_PACKAGES,zsh bash-completion)
 ### regular.mk
-mixin/regular-x11: use/luks use/volumes/alt-workstation \
+mixin/regular-x11: use/luks use/volumes/regular \
 	use/browser/firefox use/kernel/disable-usb-autosuspend \
 	use/branding use/ntp/chrony use/services/lvm2-disable
 	@$(call add,THE_LISTS,$(call tags,(base || desktop) && regular && !extra))

--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -93,7 +93,7 @@ distro/.regular-jeos: distro/.regular-jeos-base \
 	@$(call add,BASE_PACKAGES,make-initrd-mdadm cpio)
 distro/.regular-jeos-full: distro/.regular-jeos use/install2/vmguest \
-	use/volumes/jeos use/ntp/chrony use/bootloader/grub \
+	use/volumes/regular use/ntp/chrony use/bootloader/grub \
 	use/grub/localboot_bios.cfg use/kernel/latest +efi
 	@$(call add,BASE_PACKAGES,nfs-utils gdisk)
 	@$(call add,INSTALL2_PACKAGES,fdisk)