Commit 138d2cb2 authored by Anton Midyukov's avatar Anton Midyukov

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

parent 1a2af1ca
...@@ -38,7 +38,7 @@ mixin/e2k-mate: use/e2k/x11 use/x11/xorg use/fonts/install2 \ ...@@ -38,7 +38,7 @@ mixin/e2k-mate: use/e2k/x11 use/x11/xorg use/fonts/install2 \
@$(call add,THE_PACKAGES,zsh bash-completion) @$(call add,THE_PACKAGES,zsh bash-completion)
### regular.mk ### 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/browser/firefox use/kernel/disable-usb-autosuspend \
use/branding use/ntp/chrony use/services/lvm2-disable use/branding use/ntp/chrony use/services/lvm2-disable
@$(call add,THE_LISTS,$(call tags,(base || desktop) && regular && !extra)) @$(call add,THE_LISTS,$(call tags,(base || desktop) && regular && !extra))
......
...@@ -93,7 +93,7 @@ distro/.regular-jeos: distro/.regular-jeos-base \ ...@@ -93,7 +93,7 @@ distro/.regular-jeos: distro/.regular-jeos-base \
@$(call add,BASE_PACKAGES,make-initrd-mdadm cpio) @$(call add,BASE_PACKAGES,make-initrd-mdadm cpio)
distro/.regular-jeos-full: distro/.regular-jeos use/install2/vmguest \ 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 use/grub/localboot_bios.cfg use/kernel/latest +efi
@$(call add,BASE_PACKAGES,nfs-utils gdisk) @$(call add,BASE_PACKAGES,nfs-utils gdisk)
@$(call add,INSTALL2_PACKAGES,fdisk) @$(call add,INSTALL2_PACKAGES,fdisk)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment