[kernel] r16736 - dists/sid/linux-2.6/debian

[Ben Hutchings]

Author: benh
Date: Fri Dec 24 16:48:47 2010
New Revision: 16736

Log:
linux-base: Look for GRUB 1 configuration in both /boot/grub and /boot/boot/grub (Closes: #607863)

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/linux-base.postinst

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Thu Dec 23 21:23:34 2010	(r16735)
+++ dists/sid/linux-2.6/debian/changelog	Fri Dec 24 16:48:47 2010	(r16736)
@@ -13,6 +13,8 @@
     (Closes: #607284)
   * tehuti: Firmware filename is tehuti/bdx.bin
   * iwlwifi: Reduce a failure-prone memory allocation (Closes: #599345)
+  * linux-base: Look for GRUB 1 configuration in both /boot/grub and
+    /boot/boot/grub (Closes: #607863)
 
   [ maximilian attems ]
   * [openvz] Reenable NF_CONNTRACK_IPV6. (closes: #580507)

Modified: dists/sid/linux-2.6/debian/linux-base.postinst
==============================================================================
--- dists/sid/linux-2.6/debian/linux-base.postinst	Thu Dec 23 21:23:34 2010	(r16735)
+++ dists/sid/linux-2.6/debian/linux-base.postinst	Fri Dec 24 16:48:47 2010	(r16736)
@@ -238,6 +238,15 @@
 
 ### GRUB 1 (grub-legacy) config
 
+sub grub1_path {
+    for ('/boot/grub', '/boot/boot/grub') {
+	if (-d) {
+	    return "$_/menu.lst";
+	}
+    }
+    return undef;
+}
+
 sub grub1_parse {
     my ($file) = @_;
     my @results = ();
@@ -928,7 +937,7 @@
 		     list => \&fstab_list,
 		     update => \&fstab_update},
 		    {packages => 'grub grub-legacy',
-		     path => '/boot/grub/menu.lst',
+		     path => grub1_path(),
 		     list => \&grub1_list,
 		     update => \&grub1_update,
 		     post_update => \&grub1_post,