From 89257a84d0bfcd46d5514c65245b7b3f57f67ddf Mon Sep 17 00:00:00 2001
From: maximilian attems <maks@debian.org>
Date: Mon, 30 Mar 2009 00:23:54 +0200
Subject: update-initramfs: mbr_check() use /boot/grub/grub.cfg for grub2
 search.

only comes into play if lilo is installed too and usage is not
configured by do_bootloader in /etc/kernel-img.conf.

(closes: #427509)
---
 update-initramfs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'update-initramfs')

diff --git a/update-initramfs b/update-initramfs
index 2eed8cb..8c085a5 100755
--- a/update-initramfs
+++ b/update-initramfs
@@ -187,8 +187,10 @@ run_lilo()
 # check if lilo is on mbr
 mbr_check()
 {
-	# try to discover grub and be happy
-	# FIXME: check grub2 /boot/grub/grub.cfg
+	# try to discover grub|grub2 and be happy
+	[ -r /boot/grub/grub.cfg ] \
+		&& groot=$(awk '/^set root=/{print substr($2, 7, 3); exit}' \
+			/boot/grub/grub.cfg)
 	[ -r /boot/grub/menu.lst ] \
 		&& groot=$(awk '/^root/{print substr($2, 2, 3); exit}' \
 			/boot/grub/menu.lst)
-- 
cgit v1.2.3