From 30af48c871b2fdfbd37198d3cd2698c52b99fb58 Mon Sep 17 00:00:00 2001
From: Anton Midyukov <antohami@altlinux.org>
Date: Fri, 11 Sep 2020 18:40:02 +0700
Subject: [PATCH] vm.mk: Simplified conditions for choosing a bootloader
 depending on arch

---
 conf.d/vm.mk | 8 --------
 lib/vm.mk    | 8 +++++++-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/conf.d/vm.mk b/conf.d/vm.mk
index 0c97f882..59ced5eb 100644
--- a/conf.d/vm.mk
+++ b/conf.d/vm.mk
@@ -2,18 +2,10 @@
 ifeq (vm,$(IMAGE_CLASS))
 
 # NB: interactivesystem pulls in network-config-subsystem anyways
-ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 vm/bare: vm/.base-lilo +sysvinit
-else
-vm/bare: vm/.bare +sysvinit
-endif
 	@$(call add,BASE_PACKAGES,apt)
 
-ifeq (,$(filter-out i586 x86_64 ppc64le,$(ARCH)))
 vm/systemd: vm/.base-grub +systemd
-else
-vm/systemd: vm/.bare +systemd
-endif
 	@$(call add,BASE_PACKAGES,glibc-gconv-modules glibc-locales tzdata)
 	@$(call add,BASE_PACKAGES,apt)
 
diff --git a/lib/vm.mk b/lib/vm.mk
index 9b0ca65e..420d3c10 100644
--- a/lib/vm.mk
+++ b/lib/vm.mk
@@ -11,14 +11,20 @@ vm/.bare: profile/bare
 
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 vm/.base-lilo: vm/.bare use/bootloader/lilo; @:
+else
+vm/.base-lilo: vm/.base-grub; @:
 endif
 
 ifeq (,$(filter-out i586 x86_64 ppc64le,$(ARCH)))
 vm/.base-grub: vm/.bare use/bootloader/grub; @:
+else
+vm/.base-grub: vm/.base-grub-efi; @:
 endif
 
-ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
+ifeq (,$(filter-out x86_64 aarch64,$(ARCH)))
 vm/.base-grub-efi: vm/.bare use/efi/grub; @:
+else
+vm/.base-grub-efi: vm/.bare; @:
 endif
 
 endif