Skip to content

M
mkimage-profiles
Commit b7ed438f authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

branding: avoid bootloader on non-grub arches

SYSLINUX happens where GRUB happens too, just in case. The problem at hand is that some branding-*-bootloader tend to *create* /etc/sysconfig/grub2 without bothering to check that it existed, thus confusing the subsequent scripts (e.g. 65-serial.sh tries to run update-grub that's just absent then).
parent 0225b254
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
features.in/branding/config.mk
View file @ b7ed438f
...@@ -11,8 +11,11 @@ endif ...@@ -11,8 +11,11 @@ endif
# NB: not every distro might have all the branding of its own # NB: not every distro might have all the branding of its own
use/branding/full: use/branding/notes use/syslinux/ui/gfxboot \ use/branding/full: use/branding/notes use/syslinux/ui/gfxboot \
use/grub/ui/gfxboot use/grub/ui/gfxboot
@$(call add,THE_BRANDING,alterator bootloader graphics) @$(call add,THE_BRANDING,alterator graphics)
@$(call add,THE_BRANDING,indexhtml slideshow) @$(call add,THE_BRANDING,indexhtml slideshow)
ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
@$(call add,THE_BRANDING,bootloader)
endif
ifeq (,$(filter-out i586 x86_64,$(ARCH))) ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call add,THE_BRANDING,bootsplash) @$(call add,THE_BRANDING,bootsplash)
endif endif
......
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