Skip to content

M
mkimage-profiles
You need to sign in or sign up before continuing.
Commit c70f18fc authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

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

On hybrid images recorded on a USB flash drive, rather than a compact disk, this menu item loads the USB flash drive itself.
parent fe2b7125
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
conf.d/live.mk
View file @ c70f18fc
...@@ -13,7 +13,7 @@ distro/rescue-remote: distro/.base use/rescue/base use/stage2/net-eth ...@@ -13,7 +13,7 @@ distro/rescue-remote: distro/.base use/rescue/base use/stage2/net-eth
@$(call add,RESCUE_PACKAGES,livecd-net-eth) @$(call add,RESCUE_PACKAGES,livecd-net-eth)
distro/syslinux: distro/.boot \ distro/syslinux: distro/.boot \
use/syslinux/localboot.cfg use/syslinux/ui/vesamenu use/hdt; @: use/syslinux/ui/vesamenu use/hdt; @:
distro/.live-base: distro/.base use/live/base; @: distro/.live-base: distro/.base use/live/base; @:
distro/.live-x11: distro/.live-base use/live/x11; @: distro/.live-x11: distro/.live-base use/live/x11; @:
......
features.in/install2/config.mk
View file @ c70f18fc
...@@ -19,7 +19,7 @@ use/install2: use/stage2 sub/stage2@install2 use/metadata \ ...@@ -19,7 +19,7 @@ use/install2: use/stage2 sub/stage2@install2 use/metadata \
# doesn't use/install2/fs on purpose (at least so far) # doesn't use/install2/fs on purpose (at least so far)
use/install2/full: \ use/install2/full: \
use/install2/packages use/install2/vmguest use/install2/tools \ use/install2/packages use/install2/vmguest use/install2/tools \
use/syslinux/localboot.cfg use/syslinux/ui/menu use/bootloader use/syslinux/ui/menu use/bootloader
@$(call add,INSTALL2_PACKAGES,xorg-drv-synaptics) @$(call add,INSTALL2_PACKAGES,xorg-drv-synaptics)
@$(call add,INSTALL2_PACKAGES,xorg-drv-libinput) @$(call add,INSTALL2_PACKAGES,xorg-drv-libinput)
......
features.in/live/config.mk
View file @ c70f18fc
...@@ -44,8 +44,7 @@ use/live/x11: use/live/base use/deflogin/desktop use/x11-autologin use/sound \ ...@@ -44,8 +44,7 @@ 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); # 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 # 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/live/desktop: use/live/x11 use/x11/xorg use/x11/wacom \
use/l10n use/browser/firefox/live use/xdg-user-dirs/deep \ use/l10n use/browser/firefox/live use/xdg-user-dirs/deep +vmguest; @:
use/syslinux/localboot.cfg +vmguest; @:
# preconfigure apt for both live and installed-from-live systems # preconfigure apt for both live and installed-from-live systems
use/live/repo: use/live use/live/repo: use/live
...@@ -57,7 +56,7 @@ use/live/repo/online: ...@@ -57,7 +56,7 @@ use/live/repo/online:
@$(call add,LIVE_PACKAGES,livecd-online-repo) @$(call add,LIVE_PACKAGES,livecd-online-repo)
# alterator-based permanent installation # alterator-based permanent installation
use/live/install: use/metadata use/xdg-user-dirs use/syslinux/localboot.cfg \ use/live/install: use/metadata use/xdg-user-dirs \
use/bootloader/live use/bootloader/grub use/bootloader/live use/bootloader/grub
@$(call add,LIVE_PACKAGES,livecd-install) @$(call add,LIVE_PACKAGES,livecd-install)
@$(call add,LIVE_PACKAGES,livecd-installer-features) @$(call add,LIVE_PACKAGES,livecd-installer-features)
......
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