synced with mainstream

diff --cc conf/common.rmk
index 1dc13159caeae73aaf61b9fde4e652121886c04e,173f24b62ab6109c6d544ef1af5c760e704a9e24..00830e54dee944845dc2f74271b18d5ce1752534
--- 1/conf/common.rmk
--- 2/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 conf/i386-coreboot.rmk
Simple merge

diff --cc conf/i386-ieee1275.rmk
Simple merge

diff --cc conf/i386-pc.rmk
Simple merge

diff --cc conf/x86_64-efi.rmk
Simple merge

diff --cc util/grub-install.in
index 78500766cafa3858db55ef2e3260bc0f5ffa7db7,356e161e7309be602479c4746641acc7a84b1374..a004b2d1193d22a4305b06014538eeb16c46be75
--- 1/util/i386/pc/grub-install.in
--- 2/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