From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 22 Nov 2009 11:11:17 +0000 (+0100)
Subject: synced with mainstream
X-Git-Tag: 1.98~258^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fe6aa0961316a932dfde425b6229b4792a52f69;p=thirdparty%2Fgrub.git

synced with mainstream
---

4fe6aa0961316a932dfde425b6229b4792a52f69
diff --cc conf/common.rmk
index 1dc13159c,173f24b62..00830e54d
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@@ -363,12 -370,11 +370,12 @@@ scsi_mod_LDFLAGS = $(COMMON_LDFLAGS
  
  # Commands.
  pkglib_MODULES += minicmd.mod extcmd.mod hello.mod handler.mod	\
 -	ls.mod cmp.mod cat.mod help.mod search.mod loopback.mod	\
 -	fs_file.mod fs_uuid.mod configfile.mod echo.mod		\
 +	ls.mod cmp.mod cat.mod help.mod search_file.mod \
 +	search_fs_uuid.mod search_fs_label.mod search.mod loopback.mod	\
 +	configfile.mod echo.mod		\
  	terminfo.mod test.mod blocklist.mod hexdump.mod		\
  	read.mod sleep.mod loadenv.mod crc.mod parttool.mod	\
- 	msdospart.mod memrw.mod normal.mod sh.mod lua.mod	\
+ 	msdospart.mod memrw.mod normal.mod sh.mod 		\
  	gptsync.mod true.mod probe.mod password.mod		\
  	keystatus.mod
  
diff --cc util/grub-install.in
index 78500766c,356e161e7..a004b2d11
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@@ -323,17 -316,10 +323,10 @@@ if [ "${target_cpu}-${platform}" = "i38
      $grub_setup ${setup_verbose} ${setup_force} --directory=${grubdir} --device-map=${device_map} \
          ${install_device} || exit 1
  else
 -    $grub_mkimage -d ${pkglibdir} --output=/boot/multiboot.img --prefix=${prefix_drive}${relative_grubdir} $modules || exit 1
 +    $grub_mkimage ${config_opt} -d ${pkglibdir} --output=/boot/multiboot.img --prefix=${prefix_drive}${relative_grubdir} $modules || exit 1
  fi
  
- # Prompt the user to check if the device map is correct.
  echo "Installation finished. No error reported."
- echo "This is the contents of the device map $device_map."
- echo "Check if this is correct or not. If any of the lines is incorrect,"
- echo "fix it and re-run the script \`grub-install'."
- echo
- 
- cat $device_map
  
  # Bye.
  exit 0