Skip to content

M
mkimage-profiles
Commit a2eed7c8 authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

live.mk, mixin.mk, rescue: exclude sdab.cfg from use/rescue

use/rescue need for alt-workstation. But sdab.cfg is not needed. See also: https://bugzilla.altlinux.org/40704
parent 8b5e0f63
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
conf.d/live.mk
View file @ a2eed7c8
...@@ -31,6 +31,7 @@ endif ...@@ -31,6 +31,7 @@ endif
endif endif
distro/rescue: distro/.base use/rescue use/syslinux/ui/menu use/stage2/cifs \ distro/rescue: distro/.base use/rescue use/syslinux/ui/menu use/stage2/cifs \
use/rescue/.base use/syslinux/sdab.cfg use/grub/sdab_bios.cfg \
use/efi/shell +efi; @: use/efi/shell +efi; @:
distro/rescue-remote: distro/.base use/rescue/base use/stage2/net-eth distro/rescue-remote: distro/.base use/rescue/base use/stage2/net-eth
......
conf.d/mixin.mk
View file @ a2eed7c8
...@@ -137,6 +137,7 @@ mixin/office: use/fonts/ttf/google use/fonts/ttf/xo ...@@ -137,6 +137,7 @@ mixin/office: use/fonts/ttf/google use/fonts/ttf/xo
# an unrecovered filesystem's journal # an unrecovered filesystem's journal
mixin/regular-rescue: use/rescue use/isohybrid use/luks use/branding \ mixin/regular-rescue: use/rescue use/isohybrid use/luks use/branding \
use/syslinux/ui/menu use/syslinux/timeout/600 \ use/syslinux/ui/menu use/syslinux/timeout/600 \
use/rescue/.base use/syslinux/sdab.cfg use/grub/sdab_bios.cfg \
use/firmware/qlogic test/rescue/no-x11 +sysvinit; @: use/firmware/qlogic test/rescue/no-x11 +sysvinit; @:
mixin/regular-builder: use/dev/builder/base use/net/dhcp use/ntp/chrony mixin/regular-builder: use/dev/builder/base use/net/dhcp use/ntp/chrony
......
features.in/rescue/config.mk
View file @ a2eed7c8
...@@ -9,8 +9,7 @@ use/rescue/base: use/rescue/.base ...@@ -9,8 +9,7 @@ use/rescue/base: use/rescue/.base
@$(call add,RESCUE_LISTS,\ @$(call add,RESCUE_LISTS,\
$(call tags,base && (rescue || network || security || archive))) $(call tags,base && (rescue || network || security || archive)))
use/rescue: use/rescue/.base use/syslinux/sdab.cfg use/grub/sdab_bios.cfg \ use/rescue: use/rescue/.base use/services use/firmware/full +wireless
use/services use/firmware/full +wireless
@$(call add,DEFAULT_SERVICES_DISABLE,rpcbind) @$(call add,DEFAULT_SERVICES_DISABLE,rpcbind)
ifeq (,$(filter-out i586 x86_64,$(ARCH))) ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call add,RESCUE_PACKAGES,grub2-pc lilo syslinux) @$(call add,RESCUE_PACKAGES,grub2-pc lilo syslinux)
......
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