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

Do not add menu items for SUBPROFILES

Browse Source 
live can be used also as an installer or rescue.
For altinst and rescue is nothing changes.
This commit is contained in:
Anton Midyukov 2024-04-09 01:21:06 +07:00
parent 9c9b9843e3
commit e5c14a0bda
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
features.in/grub/generate.mk
View File

@ -18,7 +18,7 @@ ifeq (,$(GRUB_DIRECT))
# SUBPROFILES are considered GRUB_CFG too
# (note these can appear like stage2@live);
# 01defaults.cfg is included indefinitely
GRUB_CFG := $(GRUB_CFG) $(SUBPROFILE_DIRS) defaults fwsetup_efi
GRUB_CFG := $(GRUB_CFG) defaults fwsetup_efi
endif
ifneq (,$(GRUB_UI))

3
features.in/install2/config.mk
View File

@ -3,7 +3,8 @@
+installer: use/install2/full; @:
use/install2: use/stage2 sub/stage2@install2 use/metadata \
use/cleanup/installer use/install2/autoinstall use/grub/install2.cfg
use/cleanup/installer use/install2/autoinstall \
use/syslinux/install2.cfg use/grub/install2.cfg
@$(call add_feature)
@$(call add,INSTALL2_PACKAGES,installer-common-stage2)
@$(call try,INSTALLER,regular) # might be replaced later

3
features.in/live/config.mk
View File

@ -29,7 +29,8 @@ use/live/no-cleanup: \
use/cleanup/live-no-cleanupdb \
use/cleanup/live-no-cleanup-docs; @:
use/live/base: use/live/.base use/net use/deflogin/live use/grub/live.cfg
use/live/base: use/live/.base use/net use/deflogin/live \
use/syslinux/live.cfg use/grub/live.cfg
@$(call add,LIVE_LISTS,$(call tags,base network))
use/live/rw: use/live use/syslinux/live_rw.cfg use/grub/live_rw.cfg; @:

3
features.in/rescue/config.mk
View File

@ -1,4 +1,5 @@
use/rescue/.base: use/stage2 sub/stage2@rescue
use/rescue/.base: use/stage2 sub/stage2@rescue \
use/syslinux/rescue.cfg use/grub/rescue.cfg
@$(call add_feature)
@$(call add,RESCUE_LISTS,sysvinit)
@$(call add,RESCUE_PACKAGES,startup startup-rescue udev)

2
features.in/syslinux/generate.mk
View File

@ -24,7 +24,7 @@ ifeq (,$(SYSLINUX_DIRECT))
# SUBPROFILES are considered SYSLINUX_CFG too
# (note these can appear like stage2@live);
# 01defaults.cfg is included indefinitely
SYSLINUX_CFG := $(SYSLINUX_CFG) $(SUBPROFILE_DIRS) defaults
SYSLINUX_CFG := $(SYSLINUX_CFG) defaults
endif
DSTDIR := $(BUILDDIR)/stage1/files/syslinux/.in