vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* util/grub-install.in: Clarify strings.

Browse source 
Fix source dir check.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-27 21:31:58 +01:00
parent f122e0d648
commit 984b973ffc
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2012-02-27 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-install.in: Clarify strings.
Fix source dir check.
2012-02-27 Richard Laager <rlaager@wiktel.com> 2012-02-27 Richard Laager <rlaager@wiktel.com>
* util/getroot.c (grub_find_root_devices_from_mountinfo): Handle * util/getroot.c (grub_find_root_devices_from_mountinfo): Handle

14
util/grub-install.in
View file

@ -96,10 +96,10 @@ usage () {
printf " --recheck %s\n" "$(gettext "delete device map if it already exists")" printf " --recheck %s\n" "$(gettext "delete device map if it already exists")"
printf " --force %s\n" "$(gettext "install even if problems are detected")" printf " --force %s\n" "$(gettext "install even if problems are detected")"
printf " --force-file-id %s\n" "$(gettext "use ID file even if UUID is available")" printf " --force-file-id %s\n" "$(gettext "use ID file even if UUID is available")"
printf " --disk-module=%-10s%s\n" "$(gettext "MODULE")" "$(gettext "disk module to use (biosdisk or native). Only available on BIOS target")" printf " --disk-module=%-10s%s\n" "$(gettext "MODULE")" "$(gettext "disk module to use (biosdisk or native). This option is only available on BIOS target")"
printf " --no-nvram %s\n" "$(gettext "don't update the \`boot-device' NVRAM variable. Only available on IEEE1275 targets.")" printf " --no-nvram %s\n" "$(gettext "don't update the \`boot-device' NVRAM variable. This option is only available on IEEE1275 targets.")"
printf " --removable %s\n" "$(gettext "the installation device is removable. Only available on EFI.")" printf " --removable %s\n" "$(gettext "the installation device is removable. This option is only available on EFI.")"
printf " --bootloader-id=%-8s%s\n" "$(gettext "ID")" "$(gettext "the ID of bootloader. Only available on EFI.")" printf " --bootloader-id=%-8s%s\n" "$(gettext "ID")" "$(gettext "the ID of bootloader. This option is only available on EFI.")"
echo echo
gettext "INSTALL_DEVICE must be system device filename.";echo gettext "INSTALL_DEVICE must be system device filename.";echo
echo echo
@ -285,8 +285,8 @@ if [ x$source_dir = x ]; then
source_dir="${libdir}/@PACKAGE@/$target" source_dir="${libdir}/@PACKAGE@/$target"
fi fi
if ! [ -d "source_dir" ]; then if ! [ -d "$source_dir" ]; then
gettext_printf "%s doesn't seem to exist. Please specify --target or --directory\\n" "source_dir" gettext_printf "%s doesn't exist. Please specify --target or --directory\\n" "source_dir"
exit 1 exit 1
fi fi
@ -609,7 +609,7 @@ if [ "x${devabstraction_module}" = "x" ] ; then
elif [ x"$grub_modinfo_platform" = xloongson ] || [ x"$grub_modinfo_platform" = xqemu ] || [ x"$grub_modinfo_platform" = xcoreboot ] || [ x"$grub_modinfo_platform" = xmultiboot ] || [ x"$grub_modinfo_platform" = xqemu-mips ]; then elif [ x"$grub_modinfo_platform" = xloongson ] || [ x"$grub_modinfo_platform" = xqemu ] || [ x"$grub_modinfo_platform" = xcoreboot ] || [ x"$grub_modinfo_platform" = xmultiboot ] || [ x"$grub_modinfo_platform" = xqemu-mips ]; then
hints="`echo "${grub_device}" | xargs "$grub_probe" --device-map="${device_map}" --target=baremetal_hints --device`" hints="`echo "${grub_device}" | xargs "$grub_probe" --device-map="${device_map}" --target=baremetal_hints --device`"
else else
gettext "No hints available for your grub_modinfo_platform. Expect reduced performance" 1>&2 gettext "No hints available for your platform. Expect reduced performance" 1>&2
echo 1>&2 echo 1>&2
hints= hints=
fi fi