* grub-core/commands/i386/pc/sendkey.c (GRUB_MOD_INIT): Fix confusing

message.
	* util/grub-install.in: Fix anf gettextize error message.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-03-09 00:56:22 +01:00
parent fae01f6cfb
commit 5fd1c522d4
3 changed files with 11 additions and 2 deletions

View file

@ -1,3 +1,9 @@
2012-03-09 Vladimir Serbinenko <phcoder@gmail.com>
* 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 <phcoder@gmail.com> 2012-03-08 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-fstest.c (options): Replace N with NUM and S with STRING. * util/grub-fstest.c (options): Replace N with NUM and S with STRING.

View file

@ -373,7 +373,7 @@ GRUB_MOD_INIT (sendkey)
N_("[KEYSTROKE1] [KEYSTROKE2] ..."), N_("[KEYSTROKE1] [KEYSTROKE2] ..."),
/* TRANSLATORS: It can emulate multiple /* TRANSLATORS: It can emulate multiple
keypresses. */ keypresses. */
N_("Emulate a keystroke"), options); N_("Emulate a keystroke sequence"), options);
preboot_hook preboot_hook
= grub_loader_register_preboot_hook (grub_sendkey_preboot, = grub_loader_register_preboot_hook (grub_sendkey_preboot,

View file

@ -539,7 +539,10 @@ if test -f "${pkgdatadir}"/unicode.pf2; then
cp "${pkgdatadir}"/unicode.pf2 "${grubdir}"/fonts cp "${pkgdatadir}"/unicode.pf2 "${grubdir}"/fonts
fi 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. # 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 grub_device="`"$grub_probe" --device-map="${device_map}" --target=device "${grubdir}"`" || exit 1