lib/distro.mk: don't do localboot by default
distro/.base target used to pull in localboot syslinux config snippet which might be too early for some of the further distros; it's a quite fragile equilibrium which was shifted a bit by imz@ (see #26606). Feel free to reopen the discussion though, things might be tweaked so that localboot might be desirable on almost every image even if with lower priority...
This commit is contained in:
parent
bc8251f3f8
commit
7e219c14f1
@ -7,7 +7,7 @@ distro/dos: distro/.init use/dos use/syslinux/ui-menu
|
||||
|
||||
distro/live-systemd: distro/.base use/live/base use/systemd
|
||||
|
||||
distro/live-install: distro/.base use/live/install
|
||||
distro/live-install: distro/.base use/live/install use/syslinux/localboot.cfg
|
||||
|
||||
distro/live-isomd5sum: distro/.base use/live/base use/isomd5sum
|
||||
@$(call add,LIVE_PACKAGES,livecd-isomd5sum)
|
||||
|
@ -30,7 +30,7 @@ distro/server-ovz: distro/server-mini \
|
||||
|
||||
# tiny network-only server-ovz installer (stage2 comes over net too)
|
||||
distro/server-ovz-netinst: distro/.base sub/stage1 use/stage2 \
|
||||
use/syslinux/ui-menu use/memtest
|
||||
use/syslinux/ui-menu use/syslinux/localboot.cfg use/memtest
|
||||
@$(call add,SYSLINUX_CFG,netinstall2)
|
||||
|
||||
endif
|
||||
|
@ -20,7 +20,7 @@ distro/.init: profile/bare
|
||||
|
||||
# NB: the last flavour in KFLAVOURS gets to be the default one;
|
||||
# the kernel packages regexp evaluation has to take place at build stage
|
||||
distro/.base: distro/.init use/syslinux/localboot.cfg
|
||||
distro/.base: distro/.init
|
||||
@$(call set,KFLAVOURS,std-def)
|
||||
|
||||
# bootloader test target
|
||||
@ -30,7 +30,7 @@ distro/syslinux: distro/.init \
|
||||
|
||||
# something marginally useful (as a network-only installer)
|
||||
# NB: doesn't carry stage3 thus cannot use/bootloader
|
||||
distro/installer: distro/.base use/install2
|
||||
distro/installer: distro/.base use/install2 use/syslinux/localboot.cfg
|
||||
@$(call set,INSTALLER,altlinux-generic)
|
||||
@$(call set,STAGE1_KMODULES_REGEXP,drm.*) # for KMS
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user