Bug#637792: Creates boot.cfg in wrong directory when using separate /boot partition

[Matt Kraai <kraai@ftbfs.org>]

Package: grub-installer
Version: 1.67

Hi,

When I install on a Yeeloong using a separate /boot partition, PMON's
boot.cfg is created in the root directory instead of in /boot.  PMON
doesn't find it and this renders the system unbootable.  The attached
patch should fix the problem.

-- 
Matt Kraai
https://ftbfs.org/kraai

>From 5da63f442035a5b910e8b0d6719fb6bdeae4e156 Mon Sep 17 00:00:00 2001
From: Matt Kraai <kraai@ftbfs.org>
Date: Sun, 14 Aug 2011 07:33:29 -0700
Subject: [PATCH] Write boot.cfg to /boot if using a separate /boot partition

---
 debian/changelog |    6 ++++++
 grub-installer   |    4 +++-
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5a7f3c3..29b9db4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grub-installer (1.68) UNRELEASED; urgency=low
+
+  * Write boot.cfg to /boot if using a separate /boot partition.
+
+ -- Matt Kraai <kraai@debian.org>  Sun, 14 Aug 2011 07:31:43 -0700
+
 grub-installer (1.67) unstable; urgency=low
 
   * Team upload
diff --git a/grub-installer b/grub-installer
index 7f01a92..588af3c 100755
--- a/grub-installer
+++ b/grub-installer
@@ -1110,10 +1110,12 @@ case $ARCH in
 		fi
 		if [ "$rootfs" = "$bootfs" ]; then
 			pmon_grub_path=/boot/grub.elf
+			pmon_boot_cfg_path=$ROOT/boot.cfg
 		else
 			pmon_grub_path=/grub.elf
+			pmon_boot_cfg_path=$ROOT/boot/boot.cfg
 		fi
-		cat > $ROOT/boot.cfg <<EOF
+		cat > $pmon_boot_cfg_path <<EOF
 default 0
 timeout 0
 showmenu 0
-- 
1.7.5.4