From 9475d199a0e5380efbd13593a264b4e13c24ce7d Mon Sep 17 00:00:00 2001
From: Michael Shigorin <mike@altlinux.org>
Date: Sun, 21 Aug 2011 21:50:43 +0300
Subject: [PATCH] fixed grub installer distros

These were broken since 5ff375aa10bee7937db457d3df3115f938bb6c77
due to no bootloader being tossed anymore by the very
installer-distro-altlinux-generic (which is the default)
---
 distro.mk                        | 16 ++++++++++------
 features.in/bootloader/config.mk |  7 +++++--
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/distro.mk b/distro.mk
index 12dfe3f8..cb13ec81 100644
--- a/distro.mk
+++ b/distro.mk
@@ -32,17 +32,24 @@ distro/syslinux: distro/.init distro/.branding sub/stage1 \
 #         it's actually used); just peek inside $(CONFIG) ;-)
 # BASE_PACKAGES, BASE_LISTS, MAIN_PACKAGES, MAIN_LISTS: see sub.in/main/
 
+# live images
+
+distro/live: distro/.base use/live use/syslinux/ui-menu
+distro/rescue: distro/.base use/rescue use/syslinux/ui-menu
+
 # something actually useful (as a network-only installer)
+# NB: doesn't carry stage3 thus cannot use/bootloader
 distro/installer: distro/.base use/install2
 	@$(call set,INSTALLER,altlinux-generic)
 	@$(call set,STAGE1_KMODULES_REGEXP,drm.*)	# for KMS
 
 # server distributions
 
-distro/server-base: distro/installer sub/main use/syslinux/ui-menu use/memtest
+distro/server-base: distro/installer sub/main \
+	use/syslinux/ui-menu use/memtest use/bootloader/grub
 	@$(call add,BASE_LISTS,server-base)
 
-distro/server-ovz: distro/server-base use/hdt use/firmware/server
+distro/server-ovz: distro/server-base use/hdt use/rescue use/firmware/server
 	@$(call set,STAGE1_KFLAVOUR,std-def)
 	@$(call set,KFLAVOURS,std-def ovz-el)
 	@$(call add,KMODULES,bcmwl e1000e igb ndiswrapper rtl8168 rtl8192)
@@ -59,13 +66,10 @@ distro/minicd: distro/server-base
 	@$(call set,KFLAVOURS,pure-emerald)	# usually recent drivers
 	@$(call add,MAIN_PACKAGES,etcnet-full)
 
-distro/live: distro/.base use/live use/syslinux/ui-menu
-distro/rescue: distro/.base use/rescue use/syslinux/ui-menu
-
 # desktop distributions
 
 distro/desktop-base: distro/installer sub/main \
-	use/syslinux/ui-vesamenu use/x11/xorg
+	use/syslinux/ui-vesamenu use/x11/xorg use/bootloader/grub
 
 distro/icewm: distro/desktop-base use/lowmem use/x11/xdm use/x11/runlevel5 use/bootloader/lilo
 	@$(call add,BASE_LISTS,$(call tags,icewm desktop))
diff --git a/features.in/bootloader/config.mk b/features.in/bootloader/config.mk
index 3ba7a794..df9d7787 100644
--- a/features.in/bootloader/config.mk
+++ b/features.in/bootloader/config.mk
@@ -1,6 +1,9 @@
 # TODO: invent something prettier (think "lilo+grub" -- or error out?)
 # - add,BASE_PACKAGES,alterator-$* is overly additive
 # - remember .base if adding yet another *_PACKAGES
-use/bootloader/grub use/bootloader/lilo: use/bootloader/%:
-	@$(call set,GLOBAL_BASE_BOOTLOADER,$*)
+
+use/bootloader: use/install2 sub/main
 	@$(call add,BASE_PACKAGES,alterator-$$(GLOBAL_BASE_BOOTLOADER))
+
+use/bootloader/grub use/bootloader/lilo: use/bootloader/%: use/bootloader
+	@$(call set,GLOBAL_BASE_BOOTLOADER,$*)