konevsa/mkimage-profiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

virtualization.mk: virtualization-pve distro

Browse Source 
- New installer module for PVE (net-ifupdown2)
- Cleaned out Alterator and needless Net targets usage
This commit is contained in:
Сергей Конев 2024-11-19 02:56:59 +03:00 committed by Sergey Konev
parent fb8e2a10ab
commit 376d526852
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
conf.d/virtualization.mk
View File

@ -30,43 +30,39 @@ distro/.virtualization-base: distro/.installer +installer \
use/firmware/cpu \
use/stage2/kms \
use/stage2/ata use/stage2/fs use/stage2/hid use/stage2/md \
use/stage2/mmc use/stage2/net use/stage2/net-nfs use/stage2/cifs \
use/stage2/mmc \
use/stage2/rtc use/stage2/sbc use/stage2/scsi use/stage2/usb \
use/volumes/alt-server-v \
use/server/virt use/server/base use/docs/license use/docs/manual
use/server/virt use/server/base use/docs/license use/docs/manual \
use/cleanup/alterator
@$(call add,EFI_BOOTARGS,lang=ru_RU)
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call set,BOOTLOADER,grubpcboot)
endif
@$(call add,RESCUE_BOOTARGS,nomodeset vga=0)
@$(call add,STAGE2_BOOTARGS,mpath)
@$(call set,BRANDING,alt-server-v)
@$(call set,INSTALLER,alt-server-v)
@$(call add,INSTALL2_PACKAGES,alterator-notes)
@$(call add,INSTALL2_PACKAGES,installer-feature-multipath)
@$(call add,INSTALL2_PACKAGES,installer-feature-quota-stage2)
@$(call add,INSTALL2_PACKAGES,fonts-ttf-google-croscore-arimo)
@$(call add,INSTALL2_BRANDING,bootloader notes slideshow)
@$(call add,THE_BRANDING,alterator)
@$(call add,THE_BRANDING,indexhtml)
@$(call add,THE_PACKAGES,alterator-fbi alterator-notes)
@$(call add,THE_LISTS,$(call tags,basesystem alterator))
@$(call add,THE_LISTS,$(call tags,server alterator))
@$(call add,THE_LISTS,$(call tags,server network))
@$(call add,COMMON_PACKAGES,vim-console)
@$(call add,SYSTEM_PACKAGES,mdadm-tool lvm2 multipath-tools fdisk xfsprogs btrfs-progs file)
distro/virtualization-pve: distro/.virtualization-base \
use/ntp/chrony use/net/etcnet \
use/install2/net use/install2/autoinstall \
use/ntp/chrony use/net/ifupdown2 \
use/install2/autoinstall \
use/apt-conf/branch use/install2/repo \
use/vmguest
@$(call set,INSTALLER,virtualization-pve)
@$(call set,BRANDING,alt-virtualization-pve)
@$(call set,IMAGE_FLAVOUR,$(subst alt-$(DISTRO_VERSION)-,,$(IMAGE_NAME)))
@$(call set,META_VOL_ID,ALT Virt PVE $(DISTRO_VERSION) $(ARCH))
@$(call set,META_PUBLISHER,BaseALT Ltd)
@$(call set,META_VOL_SET,ALT)
@$(call set,META_APP_ID,ALT Virtualization PVE $(DISTRO_VERSION) $(ARCH) $(shell date +%F))
@$(call set,DOCS,alt-server-v)
@$(call set,DOCS,alt-virtualization-pve)
@$(call add,BASE_LISTS,virt/base.pkgs)
ifeq (,$(filter-out x86_64 aarch64,$(ARCH)))
@$(call add,BASE_LISTS,virt/pve)
@ -88,12 +84,14 @@ distro/virtualization-one: distro/.virtualization-base \
use/install2/net use/install2/autoinstall \
use/apt-conf/branch use/install2/repo \
use/vmguest
@$(call set,INSTALLER,alt-server-v)
@$(call set,BRANDING,alt-virtualization-one)
@$(call set,IMAGE_FLAVOUR,$(subst alt-$(DISTRO_VERSION)-,,$(IMAGE_NAME)))
@$(call set,META_VOL_ID,ALT Virt ONE $(DISTRO_VERSION) $(ARCH))
@$(call set,META_PUBLISHER,BaseALT Ltd)
@$(call set,META_VOL_SET,ALT)
@$(call set,META_APP_ID,ALT Virtualization ONE $(DISTRO_VERSION) $(ARCH) $(shell date +%F))
@$(call set,DOCS,alt-server-v)
@$(call set,DOCS,alt-virtualization-one)
@$(call add,BASE_LISTS,virt/base.pkgs)
@$(call add,MAIN_GROUPS,virtualization/110-opennebula $(opennebula))
@$(call add,MAIN_GROUPS,virtualization/400-storage)

4
features.in/net/config.mk
View File

@ -13,6 +13,10 @@ use/net/etcnet: use/net
@$(call set,THE_NET_SUBSYS,etcnet)
@$(call add,DEFAULT_SERVICES_ENABLE,network)
use/net/ifupdown2: use/net
@$(call set,THE_NET_SUBSYS,ifupdown2)
@$(call add,DEFAULT_SERVICES_ENABLE,networking.service)
use/net/dhcp: use/net
@$(call add,THE_PACKAGES,dhcpcd)

1
pkg.in/lists/virt/pve
View File

@ -2,7 +2,6 @@ pve-manager
postfix
control-sshd-permit-root-login
kernel-modules-ipset-@KFLAVOUR
kernel-modules-xtables-addons-@KFLAVOUR
kernel-modules-zfs-@KFLAVOUR
zfs-utils
alt-issue-server-pve