diff --git a/ChangeLog b/ChangeLog index def7262f6..671b6af43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-03-09 Vladimir Serbinenko + + * grub-core/commands/i386/pc/sendkey.c (GRUB_MOD_INIT): Fix confusing + message. + * util/grub-install.in: Fix anf gettextize error message. + 2012-03-08 Vladimir Serbinenko * util/grub-fstest.c (options): Replace N with NUM and S with STRING. diff --git a/grub-core/commands/i386/pc/sendkey.c b/grub-core/commands/i386/pc/sendkey.c index dbc69d49f..17f648d78 100644 --- a/grub-core/commands/i386/pc/sendkey.c +++ b/grub-core/commands/i386/pc/sendkey.c @@ -373,7 +373,7 @@ GRUB_MOD_INIT (sendkey) N_("[KEYSTROKE1] [KEYSTROKE2] ..."), /* TRANSLATORS: It can emulate multiple keypresses. */ - N_("Emulate a keystroke"), options); + N_("Emulate a keystroke sequence"), options); preboot_hook = grub_loader_register_preboot_hook (grub_sendkey_preboot, diff --git a/util/grub-install.in b/util/grub-install.in index cac28cf70..f5ecffb79 100644 --- a/util/grub-install.in +++ b/util/grub-install.in @@ -539,7 +539,10 @@ if test -f "${pkgdatadir}"/unicode.pf2; then cp "${pkgdatadir}"/unicode.pf2 "${grubdir}"/fonts fi -is_path_readable_by_grub "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform" || (echo "${grubdir}" not readable 1>&2 ; exit 1) +if ! is_path_readable_by_grub "${grubdir}"; then + gettext_printf "Path \`%s' is not readable by GRUB on boot. Installation is impossible. Aborting.\n" "${grubdir}" 1>&2 + exit 1 +fi # Write device to a variable so we don't have to traverse /dev every time. grub_device="`"$grub_probe" --device-map="${device_map}" --target=device "${grubdir}"`" || exit 1