Skip to content

M
mkimage-profiles
Commit 2fb0293d authored by Gleb Fotengauer-Malinovskiy's avatar Gleb Fotengauer-Malinovskiy Committed by Michael Shigorin
Browse files
Options

regular-jeos: use grub on architectures not supported by lilo

parent 255a0f87
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 1 deletion
conf.d/regular.mk
View file @ 2fb0293d
......@@ -61,9 +61,19 @@ distro/.regular-jeos-base: distro/.regular-bare +sysvinit \
@$(call add,THE_PACKAGES,apt basesystem dhcpcd vim-console)
@$(call add,THE_LISTS,openssh)
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
distro/.regular-jeos-bootloader: use/bootloader/lilo ; @:
else
ifeq (,$(filter-out $(GRUB_ARCHES),$(ARCH)))
distro/.regular-jeos-bootloader: use/bootloader/grub ; @:
else
distro/.regular-jeos-bootloader: ; @:
endif
endif
# ...and for somewhat bare distros
distro/.regular-jeos: distro/.regular-jeos-base \
use/bootloader/lilo use/syslinux/lateboot.cfg \
distro/.regular-jeos-bootloader use/syslinux/lateboot.cfg \
use/install2/cleanup/everything use/install2/cleanup/kernel/everything \
use/cleanup/jeos
@$(call add,BASE_KMODULES,guest scsi vboxguest)
......
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