From: Felix Zielcke <fzielcke@z-51.de>
Date: Sat, 21 Nov 2009 22:25:20 +0000 (+0100)
Subject: Merge remote
X-Git-Tag: 1.98~388
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=8e3be195c4de874e1620fb600f1d5b342fbe1b41;p=thirdparty%2Fgrub.git

Merge remote
---

8e3be195c4de874e1620fb600f1d5b342fbe1b41
diff --cc ChangeLog
index e9b054d0c,243a92c4d..79978d307
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,10 +1,16 @@@
+ 2009-11-21  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+ 
+ 	* util/getroot.c [__GNU__]: Include <hurd.h>, <hurd/lookup.h>, and
+ 	<hurd/fs.h>
+ 	[__GNU__] (grub_guess_root_device): Call file_name_lookup and
+ 	file_get_storage_info to implement grub_guess_root_device.
+ 
 +2009-11-21  Felix Zielcke  <fzielcke@z-51.de>
 +
 +	* Makefile.in (target): Use make's builtin $(shell) function
 +	instead of calling directly $(SHELL) to create the locale directories,
 +	inside the $(foreach) function.
 +
  2009-11-21  Felix Zielcke  <fzielcke@z-51.de>
  
  	* util/grub-mkrescue.in: Print an error and usage if output option