From b7ed438fabda5ba8a8b2e42c5583d91baa1dad7d Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Sat, 22 Aug 2020 23:04:31 +0300 Subject: [PATCH] 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). --- features.in/branding/config.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/features.in/branding/config.mk b/features.in/branding/config.mk index 049d2b1c..27b3dd56 100644 --- a/features.in/branding/config.mk +++ b/features.in/branding/config.mk @@ -11,8 +11,11 @@ endif # NB: not every distro might have all the branding of its own use/branding/full: use/branding/notes use/syslinux/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) +ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH))) + @$(call add,THE_BRANDING,bootloader) +endif ifeq (,$(filter-out i586 x86_64,$(ARCH))) @$(call add,THE_BRANDING,bootsplash) endif