shaba/mkimage-profiles
1
0
Fork 0
forked from altcloud/mkimage-profiles
Code Issues 1 Pull Requests Releases Wiki Activity

Revert "install2, live, live.mk: drop use/syslinux/localboot.cfg"

Browse Source 
This reverts commit c70f18fcbade310faf55786179e2aa3539cf8187.
This commit is contained in:
Anton Midyukov 2020-07-06 14:57:59 +07:00
parent 540f1082d8
commit 8bdafdc02a
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf.d/live.mk
View File

@ -13,7 +13,7 @@ distro/rescue-remote: distro/.base use/rescue/base use/stage2/net-eth
@$(call add,RESCUE_PACKAGES,livecd-net-eth)
distro/syslinux: distro/.boot \
use/syslinux/ui/vesamenu use/hdt; @:
use/syslinux/localboot.cfg use/syslinux/ui/vesamenu use/hdt; @:
distro/.live-base: distro/.base use/live/base; @:
distro/.live-x11: distro/.live-base use/live/x11; @:

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

@ -20,7 +20,7 @@ use/install2: use/stage2 sub/stage2@install2 use/metadata \
# doesn't use/install2/fs on purpose (at least so far)
use/install2/full: \
use/install2/packages use/install2/vmguest use/install2/tools \
use/syslinux/ui/menu use/bootloader
use/syslinux/localboot.cfg use/syslinux/ui/menu use/bootloader
@$(call add,INSTALL2_PACKAGES,xorg-drv-synaptics)
@$(call add,INSTALL2_PACKAGES,xorg-drv-libinput)

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

@ -44,7 +44,8 @@ use/live/x11: use/live/base use/deflogin/desktop use/x11-autologin use/sound \
# this target specifically pulls free xorg drivers in (and a few more bits);
# a browser is requested too, the recommended one can be overridden downstream
use/live/desktop: use/live/x11 use/x11/xorg use/x11/wacom \
use/l10n use/browser/firefox/live use/xdg-user-dirs/deep +vmguest; @:
use/l10n use/browser/firefox/live use/xdg-user-dirs/deep \
use/syslinux/localboot.cfg +vmguest; @:
# preconfigure apt for both live and installed-from-live systems
use/live/repo: use/live
@ -56,7 +57,7 @@ use/live/repo/online:
@$(call add,LIVE_PACKAGES,livecd-online-repo)
# alterator-based permanent installation
use/live/install: use/metadata use/xdg-user-dirs \
use/live/install: use/metadata use/xdg-user-dirs use/syslinux/localboot.cfg \
use/bootloader/live use/bootloader/grub
@$(call add,LIVE_PACKAGES,livecd-install)
@$(call add,LIVE_PACKAGES,livecd-installer-features)