Commit 75e09c00 authored by Dmitriy Terekhin's avatar Dmitriy Terekhin Committed by Anton Midyukov

alt-server: Use live as installer and rescue

INSTALL2_PACKAGES to LIVE_PACKAGES INSTALL2_BRANDING to STAGE2_BRANDING Suggested-by: 's avatarAnton Midyukov <antohami@altlinux.org>
parent 3289ad7c
...@@ -30,7 +30,7 @@ distro/alt-server: monitoring = $(addprefix server-v/,\ ...@@ -30,7 +30,7 @@ distro/alt-server: monitoring = $(addprefix server-v/,\
# FIXME: generalize vm-profile # FIXME: generalize vm-profile
distro/alt-server:: distro/.base mixin/alt-server use/vmguest/base \ distro/alt-server:: distro/.base mixin/alt-server use/vmguest/base \
use/bootloader/grub use/rescue/base use/stage2/kms\ use/bootloader/grub use/stage2/kms \
use/stage2/ata use/stage2/fs use/stage2/hid use/stage2/md \ 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/net use/stage2/net-nfs use/stage2/cifs \
use/stage2/rtc use/stage2/sbc use/stage2/scsi use/stage2/usb \ use/stage2/rtc use/stage2/sbc use/stage2/scsi use/stage2/usb \
...@@ -49,13 +49,13 @@ ifneq (,$(filter-out e2k%,$(ARCH))) ...@@ -49,13 +49,13 @@ ifneq (,$(filter-out e2k%,$(ARCH)))
@$(call add,INSTALL2_PACKAGES,installer-feature-desktop-suspend-stage2) @$(call add,INSTALL2_PACKAGES,installer-feature-desktop-suspend-stage2)
endif endif
@$(call add,STAGE2_BOOTARGS,mpath) @$(call add,STAGE2_BOOTARGS,mpath)
@$(call add,INSTALL2_PACKAGES,installer-feature-multipath) @$(call add,LIVE_PACKAGES,installer-feature-multipath)
@$(call add,SYSTEM_PACKAGES,multipath-tools) @$(call add,SYSTEM_PACKAGES,multipath-tools)
@$(call add,SERVICES_ENABLE,multipathd) @$(call add,SERVICES_ENABLE,multipathd)
@$(call add,INSTALL2_PACKAGES,strace) @$(call add,LIVE_PACKAGES,strace)
@$(call add,INSTALL2_PACKAGES,fdisk) @$(call add,LIVE_PACKAGES,fdisk)
@$(call add,INSTALL2_PACKAGES,btrfs-progs) @$(call add,LIVE_PACKAGES,btrfs-progs)
@$(call add,INSTALL2_BRANDING,notes) @$(call add,STAGE2_BRANDING,notes)
@$(call add,CLEANUP_BASE_PACKAGES,acpid-events-power) @$(call add,CLEANUP_BASE_PACKAGES,acpid-events-power)
@$(call add,RESCUE_BOOTARGS,nomodeset vga=0) @$(call add,RESCUE_BOOTARGS,nomodeset vga=0)
ifeq (,$(filter-out e2k,$(ARCH))) ifeq (,$(filter-out e2k,$(ARCH)))
...@@ -79,8 +79,6 @@ ifeq (,$(filter-out x86_64 aarch64 loongarch64,$(ARCH))) ...@@ -79,8 +79,6 @@ ifeq (,$(filter-out x86_64 aarch64 loongarch64,$(ARCH)))
distro/alt-server:: +efi; @: distro/alt-server:: +efi; @:
endif endif
distro/alt-server:: use/install2/vnc/listen; @:
ifeq (,$(filter-out e2k%,$(ARCH))) ifeq (,$(filter-out e2k%,$(ARCH)))
distro/alt-server:: +power +net-eth; @: distro/alt-server:: +power +net-eth; @:
endif endif
......
...@@ -12,17 +12,19 @@ mixin/alt-server: server_main_kmodules = bcmwl ch34x dm-secdel drbd9 drm-ancient ...@@ -12,17 +12,19 @@ mixin/alt-server: server_main_kmodules = bcmwl ch34x dm-secdel drbd9 drm-ancient
v4l2loopback vboxsf vhba virtualbox-addition-guest virtualbox-addition \ v4l2loopback vboxsf vhba virtualbox-addition-guest virtualbox-addition \
virtualbox-addition-video virtualbox xtables-addons virtualbox-addition-video virtualbox xtables-addons
mixin/alt-server: +installer +systemd \ mixin/alt-server: +systemd \
+live-installer-pkg \
use/live/rescue \
use/live/repo \
use/live/suspend \
use/live-install/vnc/listen \
use/ntp/chrony \ use/ntp/chrony \
use/branding/notes \ use/branding/notes \
use/control use/services \ use/control use/services \
use/install2/stage3 \
use/install2/vnc use/install2/xfs use/install2/fat \
use/install2/oem \
use/volumes/alt-server \ use/volumes/alt-server \
use/apt-conf/branch \ use/apt-conf/branch \
use/fonts/install2 \ use/fonts/install2 \
use/l10n/default/ru_RU use/install2/stage3 \ use/l10n/default/ru_RU \
use/firmware/full \ use/firmware/full \
use/net/etcnet \ use/net/etcnet \
use/tty use/tty
...@@ -36,8 +38,8 @@ endif ...@@ -36,8 +38,8 @@ endif
@$(call add,THE_BRANDING,alterator) @$(call add,THE_BRANDING,alterator)
ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH))) ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
@$(call set,KFLAVOURS,std-def un-def) @$(call set,KFLAVOURS,std-def un-def)
@$(call add,INSTALL2_PACKAGES,installer-feature-cleanup-kernel-stage3) @$(call add,LIVE_PACKAGES,installer-feature-cleanup-kernel-stage3)
@$(call add,INSTALL2_PACKAGES,ntfs-3g) @$(call add,LIVE_PACKAGES,ntfs-3g)
@$(call add,BASE_KMODULES,drm) @$(call add,BASE_KMODULES,drm)
@$(call add,MAIN_GROUPS,centaurus/proxmox-backup-server) @$(call add,MAIN_GROUPS,centaurus/proxmox-backup-server)
@$(call add,MAIN_GROUPS,centaurus/token) @$(call add,MAIN_GROUPS,centaurus/token)
...@@ -68,20 +70,20 @@ ifeq (,$(filter-out i586 x86_64 aarch64 loongarch64 e2k%,$(ARCH))) ...@@ -68,20 +70,20 @@ ifeq (,$(filter-out i586 x86_64 aarch64 loongarch64 e2k%,$(ARCH)))
endif endif
@$(call add,THE_PROFILES,minimal) @$(call add,THE_PROFILES,minimal)
@$(call add,STAGE1_MODLISTS,stage2-mmc) @$(call add,STAGE1_MODLISTS,stage2-mmc)
@$(call add,INSTALL2_PACKAGES,installer-feature-multipath) @$(call add,LIVE_PACKAGES,installer-feature-multipath)
@$(call add,INSTALL2_PACKAGES,installer-feature-desktop-other-fs-stage2) @$(call add,LIVE_PACKAGES,installer-feature-desktop-other-fs-stage2)
@$(call add,INSTALL2_PACKAGES,installer-feature-alphabet-profiles) @$(call add,LIVE_PACKAGES,installer-feature-alphabet-profiles)
@$(call add,INSTALL2_PACKAGES,installer-feature-load-tun) @$(call add,LIVE_PACKAGES,installer-feature-load-tun)
@$(call add,INSTALL2_PACKAGES,installer-feature-network-shares-stage3) @$(call add,LIVE_PACKAGES,installer-feature-network-shares-stage3)
@$(call add,INSTALL2_PACKAGES,installer-feature-auto-domain) @$(call add,LIVE_PACKAGES,installer-feature-auto-domain)
ifneq (,$(filter-out e2k%,$(ARCH))) ifneq (,$(filter-out e2k%,$(ARCH)))
@$(call add,INSTALL2_PACKAGES,installer-feature-quota-stage2) @$(call add,LIVE_PACKAGES,installer-feature-quota-stage2)
endif endif
ifeq (,$(filter-out x86_64,$(ARCH))) ifeq (,$(filter-out x86_64,$(ARCH)))
@$(call add,MAIN_GROUPS,centaurus/jitsi-meet) @$(call add,MAIN_GROUPS,centaurus/jitsi-meet)
endif endif
@$(call add,INSTALL2_PACKAGES,fdisk) @$(call add,LIVE_PACKAGES,fdisk)
@$(call add,INSTALL2_PACKAGES,xorg-conf-synaptics) @$(call add,LIVE_PACKAGES,xorg-conf-synaptics)
@$(call add,COMMON_PACKAGES,vim-console) @$(call add,COMMON_PACKAGES,vim-console)
@$(call add,DEFAULT_SERVICES_ENABLE,rpcbind sshd bind) @$(call add,DEFAULT_SERVICES_ENABLE,rpcbind sshd bind)
@$(call add,DEFAULT_SYSTEMD_SERVICES_ENABLE,systemd-networkd.service systemd-resolved.service) @$(call add,DEFAULT_SYSTEMD_SERVICES_ENABLE,systemd-networkd.service systemd-resolved.service)
......
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