diff options
| author | Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> | 2012-02-05 11:07:33 +0100 |
|---|---|---|
| committer | Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> | 2012-02-05 11:07:33 +0100 |
| commit | 0ae70393bab7102e95f4513372395db33c63fba1 (patch) | |
| tree | d0767710b008d9b03060f3b3dac2de1a125557b2 /util/grub-setup.c | |
| parent | 0a96117de77002e52e9b3b6b5c671cf79c4c7558 (diff) | |
Improve and unify messages.
* grub-core/kern/emu/hostdisk.c (grub_util_get_fd_sectors): Add argument
name. All users updated.
Print filename in error.
(read_device_map): Print filename in error.
* util/getroot.c (grub_guess_root_devices): Print filename in error.
(grub_util_get_os_disk): Likewise.
(grub_util_biosdisk_get_grub_dev): Likewise.
(grub_util_check_block_device): Likewise.
(grub_util_check_char_device): Likewise.
(grub_make_system_path_relative_to_its_root): Likewise.
* util/grub-editenv.c (create_envblk_file): Likewise.
(open_envblk_file): Likewise.
(write_envblk): Likewise.
* util/grub-fstest.c (cmd_cp): Likewise.
(cmd_cat): Likewise.
(cmd_cmp): Likewise.
* util/grub-menulst2cfg.c (main): Likewise.
* util/grub-mkfont.c (write_font_ascii_bitmap): Likewise.
(write_font_width_spec): Likewise.
(write_font_pf2): Likewise.
* util/grub-mkimage.c (generate_image): New argument outname.
All users updated.
Remove unreacheable message.
(options): Unify messages.
(help_filter): Likewise.
* util/grub-mklayout.c (usage): Removed (unused).
(main): Print filename in error.
* util/grub-mkrescue.in: Fix wrong quoting.
* util/grub-setup.c (setup): Print filename in error.
* util/ieee1275/ofpath.c (vendor_is_ATA): Likewise.
(check_sas): Likewise.
* util/misc.c (grub_util_get_fp_size): Removed.
(grub_util_get_image_size): Print filename in error.
(grub_util_read_at): Removed.
(grub_util_read_image): Print filename in error.
(grub_util_load_image): Likewise.
(grub_util_write_image_at): New argument filename. All users updated.
Print filename in error.
(grub_util_write_image): New argument filename. All users updated.
Print filename in error.
* util/raid.c (grub_util_raid_getmembers): Print filename in error.
* util/resolve.c (grub_util_resolve_dependencies): Likewise.
Diffstat (limited to 'util/grub-setup.c')
| -rw-r--r-- | util/grub-setup.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/util/grub-setup.c b/util/grub-setup.c index e5a8ced95..cdc728433 100644 --- a/util/grub-setup.c +++ b/util/grub-setup.c @@ -709,9 +709,10 @@ unable_to_embed: grub_util_info ("opening the core image `%s'", core_path); fp = fopen (core_path, "r+b"); if (! fp) - grub_util_error (_("cannot open `%s'"), core_path); + grub_util_error (_("cannot open `%s': %s"), core_path, + strerror (errno)); - grub_util_write_image (core_img, GRUB_DISK_SECTOR_SIZE * 2, fp); + grub_util_write_image (core_img, GRUB_DISK_SECTOR_SIZE * 2, fp, core_path); fclose (fp); finish: |