2007-07-02 Robert Millan <rmh@aybabtu.com>
* util/i386/efi/grub-install.in: Allow `grub_probe --target=partmap' invocation to fail, in order to support partition-less media. * util/i386/pc/grub-install.in: Likewise. * util/powerpc/ieee1275/grub-install.in: Use grub-probe to determine which fs or partmap modules are needed (akin to its sister scripts). Also use grub-probe to get rid of unportable /proc/mounts check. Print the same informational message that the other scripts do, before exitting.
This commit is contained in:
parent
6193defe9f
commit
2c2a681b39
4 changed files with 67 additions and 20 deletions
|
@ -186,13 +186,10 @@ if test "x$fs_module" = xfat; then :; else
|
|||
exit 1
|
||||
fi
|
||||
|
||||
# Then the partition map module.
|
||||
partmap_module=`$grub_probe --target=partmap --device-map=${device_map} ${grubdir}`
|
||||
if test "x$partmap_module" = x -a "x$modules" = x; then
|
||||
echo "Auto-detection of a partition map module failed." 1>&2
|
||||
echo "Please specify the module with the option \`--modules' explicitly." 1>&2
|
||||
exit 1
|
||||
fi
|
||||
# Then the partition map module. In order to support partition-less media,
|
||||
# this command is allowed to fail (--target=fs already grants us that the
|
||||
# filesystem will be accessible).
|
||||
partmap_module=`$grub_probe --target=partmap --device-map=${device_map} ${grubdir} 2> /dev/null`
|
||||
|
||||
# _chain is often useful
|
||||
modules="$modules $fs_module $partmap_module _chain"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue