Felix Zielcke
8d0502d9b2
2009-12-11 Felix Zielcke <fzielcke@z-51.de>
...
* util/misc.c: Don't include <errno.h> twice.
2009-12-11 11:11:34 +01:00
Robert Millan
febfc12c6e
2009-12-10 Robert Millan <rmh.grub@aybabtu.com>
...
* include/grub/mips/libgcc.h: Only export symbols for functions
that libgcc provides.
2009-12-10 22:38:54 +00:00
Felix Zielcke
0d56ed64d2
2009-12-10 Felix Zielcke <fzielcke@z-51.de>
...
* disk/i386/pc/biosdisk.c (grub_biosdisk_open): Show the disk
name in an error message.
(grub_biosdisk_rw): Likewise.
2009-12-10 19:15:20 +01:00
Vladimir 'phcoder' Serbinenko
2e59983c82
2009-12-10 Vladimir Serbinenko <phcoder@gmail.com>
...
Eliminate NTFS 4Gib barrier.
* fs/ntfs.c (read_attr): Use grub_disk_addr_t and grub_size_t.
(read_run_data): Likewise.
(grub_ntfs_read_run_list): Likewise.
(grub_ntfs_read_block): Likewise.
(grub_ntfs_iterate_dir): Likewise.
(read_mft): Likewise.
(read_data): Likewise.
Use COM_LOG_LEN.
* fs/ntfscomp.c (read_block): Cast ctx->target_vcn & 0xF to unsigned
to avoid 64-bit division
* include/grub/ntfs.h (COM_LOG_LEN): New definition.
(grub_ntfs_rlst): Use grub_disk_addr_t.
2009-12-10 14:45:00 +01:00
Vladimir 'phcoder' Serbinenko
71ee178adb
2009-12-10 Vladimir Serbinenko <phcoder@gmail.com>
...
Eliminate grub-fstest 4Gib barrier.
* util/grub-fstest.c (skip, leng): Use grub_disk_addr_t.
(read_file): Fix error reporting.
2009-12-10 14:39:54 +01:00
Vladimir 'phcoder' Serbinenko
2520d4b815
2009-12-10 Vladimir Serbinenko <phcoder@gmail.com>
...
Eliminate hexdump 4Gib barrier.
* commands/hexdump.c (grub_cmd_hexdump): Use grub_disk_addr_t.
* lib/arg.c (grub_arg_parse): Use grub_strtoull.
2009-12-10 14:37:42 +01:00
Vladimir 'phcoder' Serbinenko
e1f270654e
2009-12-10 Vladimir Serbinenko <phcoder@gmail.com>
...
* kern/device.c (grub_device_iterate): Ignore errors during first scan.
Fixes amarsh bug.
2009-12-10 13:26:22 +01:00
Robert Millan
1a0f7f4553
2009-12-09 Bruce Dubbs <bruce.dubbs@gmail.com>
...
Remove miscellaneous files in distclean target.
* Makefile.in: Remove docs/{grub.info,version.texi,stamp-vti}
2009-12-09 21:43:05 +00:00
Vladimir 'phcoder' Serbinenko
8f44a91ea9
Fix bug in at_keyboard which blocked the menu countdown.
2009-12-09 21:47:58 +01:00
Vladimir 'phcoder' Serbinenko
02772f981b
correct return value of checkkey for null-terminal
2009-12-09 20:34:14 +01:00
Vladimir 'phcoder' Serbinenko
546d060783
grub-install for yeeloong
2009-12-09 19:39:21 +01:00
Vladimir 'phcoder' Serbinenko
d114e89ca8
Add clock
2009-12-09 17:58:48 +01:00
Colin Watson
c631d9fb17
2009-12-09 Colin Watson <cjwatson@ubuntu.com>
...
* util/grub-mkconfig_lib.in: Don't set grub_probe or grub_mkrelpath
if they're already set. This resolves the conflict between my
grub-install change on 2009-10-06 and Felix' change on 2009-11-11,
fixing the --grub-probe option again.
* util/sparc64/ieee1275/grub-install.in: Revert the last piece of my
change on 2009-10-06, so that we now once again source
`${libdir}/grub/grub-mkconfig_lib' after options have been parsed.
2009-12-09 16:20:17 +00:00
Robert Millan
7c7b610626
2009-12-08 Robert Millan <rmh.grub@aybabtu.com>
...
* conf/common.rmk [sparc64-ieee1275] (grub_mkdevicemap_SOURCES): Use
`util/ieee1275/ofpath.c' and `util/ieee1275/devicemap.c' instead of
`util/devicemap.c'.
2009-12-08 16:00:52 +00:00
Colin Watson
6c1f8c1215
2009-12-08 Colin Watson <cjwatson@ubuntu.com>
...
* util/grub.d/30_os-prober.in: Call save_default_entry for hurd.
2009-12-08 01:02:08 +00:00
Colin Watson
b967a04d5b
2009-12-08 Colin Watson <cjwatson@ubuntu.com>
...
* util/grub.d/00_header.in: Use `set var=val' rather than plain
`var=val'.
* util/grub-mkconfig_lib.in (save_default_entry): Likewise.
2009-12-08 01:01:21 +00:00
Colin Watson
47075ea3c7
2009-12-08 Colin Watson <cjwatson@ubuntu.com>
...
* util/grub-reboot.in: Fix --version output.
* util/grub-set-default.in: Likewise.
2009-12-08 01:00:26 +00:00
Colin Watson
42356b4d5e
2009-12-08 Colin Watson <cjwatson@ubuntu.com>
...
* util/grub.d/00_header.in: Silently ignore zero-sized environment
blocks.
2009-12-08 00:59:26 +00:00
Colin Watson
36cd6dd151
2009-12-08 Colin Watson <cjwatson@ubuntu.com>
...
* util/grub.d/00_header.in: Quote the value assigned to `default',
in case it contains spaces.
2009-12-08 00:57:46 +00:00
Colin Watson
b824145a8f
2009-12-08 Colin Watson <cjwatson@ubuntu.com>
...
* util/grub.d/30_os-prober.in: Fix merge error that moved a
`save_default_entry' call from the macosx case to the linux case.
2009-12-08 00:56:39 +00:00
Colin Watson
e8b2988803
merge from trunk
2009-12-08 00:55:17 +00:00
Carles Pina i Estany
e3069ec1a5
2009-12-08 Carles Pina i Estany <carles@pina.cat>
...
* include/grub/misc.h (grub_printf_): New declaration.
* kern/misc.c (grub_printf_): New definition.
* normal/main.c (grub_normal_reader_init): Use `grub_printf_' and `N_'
instead of `grub_printf' and `_'.
* normal/menu_entry.c (store_completion): Likewise.
(run): Likewise.
(grub_menu_entry_run): Likewise.
* normal/menu_text.c (grub_wait_after_message): Likewise.
(notify_booting): Likewise.
(notify_fallback): Likewise.
(notify_execution_failure): Likewise.
2009-12-08 00:08:52 +00:00
Colin Watson
d6ceebf1d9
2009-12-07 Colin Watson <cjwatson@ubuntu.com>
...
* configure.ac: Check for vasprintf.
* util/misc.c (asprintf): Move allocation from here ...
(vasprintf): ... to here. New function.
(xasprintf): New function.
* include/grub/util/misc.h (vasprintf, xasprintf): Add
prototypes.
* util/getroot.c (grub_util_get_grub_dev): Use xasprintf.
* util/grub-mkfont.c (write_font): Likewise.
* util/grub-probe.c (probe): Likewise.
* util/hostdisk.c (make_device_name): Likewise.
2009-12-07 16:46:24 +00:00
Vladimir 'phcoder' Serbinenko
52d67f54e0
fix linux parameter passing on mips
2009-12-07 16:51:21 +01:00
Vladimir 'phcoder' Serbinenko
0f355bc6b3
add memory routines
2009-12-07 16:16:10 +01:00
David S. Miller
de6daa8b56
2009-12-06 David S. Miller <davem@sunset.davemloft.net>
...
* disk/ieee1275/ofdisk.c (grub_ofdisk_iterate): Recognize
anything even prefixed with 'cdrom' as a cdrom.
2009-12-07 11:54:25 +01:00
Vladimir 'phcoder' Serbinenko
d5b44e501d
retrieve firmware arguments
2009-12-07 02:09:39 +01:00
Vladimir 'phcoder' Serbinenko
b391bdb2f2
Use dedicated simple password retriever for size of future crypto disks modules and simplify entering passwords routines
2009-12-06 20:11:50 +01:00
Vladimir 'phcoder' Serbinenko
a22078eb4f
Startup code cleanup
2009-12-06 15:32:32 +01:00
Felix Zielcke
df91e67900
2009-12-06 Felix Zielcke <fzielcke@z-51.de>
...
* util/misc.c (make_system_path_relative_to_its_root): Correctly cope with
mount points.
2009-12-06 10:20:01 +01:00
Vladimir 'phcoder' Serbinenko
c0a6bd447e
fix *-emu build
2009-12-05 20:45:32 +01:00
Carles Pina i Estany
98d3dc02fe
2009-12-05 Carles Pina i Estany <carles@pina.cat>
...
* gettext/gettext.c: Include `<grub/list.h>'. Define grub_gettext_msg,
grub_gettext_msg_list.
(grub_gettext_gettranslation_from_position): Return const char *
and not char *.
(grub_gettext_translate): Add the translated strings into a list,
returns from the list if existing there.
(grub_gettext_init_ext): Add \n at the end of grub_dprintf string.
(grub_gettext_delete_list): Delete the list.
(grub_gettext_env_write_lang): Call grub_gettext_delete_list when
lang environment variable is changed.
(GRUB_MOD_FINI): Call grub_gettext_delete_list.
2009-12-05 19:03:27 +00:00
Vladimir 'phcoder' Serbinenko
fd39f820fd
fix mismerge with trunk (progname)
2009-12-05 18:59:36 +01:00
Vladimir 'phcoder' Serbinenko
bef393d4b3
fix qemu and coreboot ports
2009-12-05 18:46:28 +01:00
Vladimir 'phcoder' Serbinenko
df2e3593f3
merge mainline into mips
2009-12-05 18:37:15 +01:00
Vladimir 'phcoder' Serbinenko
b283f10857
2009-12-05 Vladimir Serbinenko <phcoder@gmail.com>
...
Rename kernel.mod to kernel.img.
* conf/i386-efi.rmk (pkglib_MODULES): Change kernel.mod to kernel.img.
(kernel_mod_EXPORTS): Rename to ...
(kernel_img_EXPORTS): ... this.
(kernel_mod_SOURCES): Rename to ...
(kernel_img_SOURCES): ... this.
(kernel_mod_HEADERS): Rename to ...
(kernel_img_HEADERS): ... this. All users updated.
(kernel_mod_CFLAGS): Rename to ...
(kernel_img_CFLAGS): ... this.
(kernel_mod_ASFLAGS): Rename to ...
(kernel_img_ASFLAGS): ... this.
(kernel_mod_LDFLAGS): Rename to ...
(kernel_img_LDFLAGS): ... this.
* conf/x86_64-efi.rmk: Likewise.
* util/i386/efi/grub-mkimage.c (read_kernel_module): Rename to ...
(read_kernel_image): ... this. All users updated.
(read_kernel_image): Read "kernel.img" instead of "kernel.mod".
2009-12-05 17:10:36 +01:00
Vladimir 'phcoder' Serbinenko
7d624c2949
merge mainline into crypto
2009-12-05 16:34:27 +01:00
Vladimir 'phcoder' Serbinenko
9d1fafb96e
Move include/grub/cipher_wrap.h to lib/libgcrypt_wrap/cipher_wrap.h
2009-12-05 16:33:39 +01:00
Carles Pina i Estany
69055f8a2f
2009-12-05 Carles Pina i Estany <carles@pina.cat>
...
* normal/menu_text.c (grub_color_menu_high): Gettexttize string.
(print_spaces): New function.
(grub_print_ucs4): New function.
(getstringwidth): New function.
(print_message_indented): New function.
(print_message): Gettexttize strings using print_message_indented.
(run_menu): Replaces grub_printf by print_spaces and dynamic terminal
width.
(get_entry_number): Gettextize and uses dynamic terminal width.
(notify_booting, notify_fallback, notify_execution_failure):
Gettextize.
* normal/menu_entry.c (store_completion): Cleanup the gettextized
string.
(run): Likewise.
(grub_menu_entry_run): Likewise.
* PO/POTFILES: Add normal/menu_entry.c.
2009-12-05 11:25:07 +00:00
Vladimir 'phcoder' Serbinenko
e420686f13
Ignore some VBE info
2009-12-05 11:29:47 +01:00
Vladimir 'phcoder' Serbinenko
f616f51c3c
2009-12-05 Vladimir Serbinenko <phcoder@gmail.com>
...
* configure.ac (TARGET_ASFLAGS): Add "-D<MACHINE>".
2009-12-05 11:08:26 +01:00
Carles Pina i Estany
57bbe3beb1
2009-12-05 Carles Pina i Estany <carles@pina.cat>
...
* util/grub-install.in: Install gettext .mo files.
* util/grub-mkrescue.in (process_input_dir): Copy gettext .mo files.
2009-12-05 09:31:36 +00:00
Carles Pina i Estany
013d67a149
2009-12-05 Carles Pina i Estany <carles@pina.cat>
...
* gettext/gettext.c (grub_gettext_init_ext): Replace grub_printf with
grub_dprintf.
2009-12-05 09:25:46 +00:00
Robert Millan
fb954db0d5
2009-12-05 Robert Millan <rmh.grub@aybabtu.com>
...
* kern/ieee1275/openfw.c (grub_reboot): Disable for i386. The
non-firmware-dependant one in realmode.S takes precedence.
2009-12-05 01:43:17 +00:00
Robert Millan
c4282e6cb3
Remove mips/reboot.h.
2009-12-04 00:05:48 +00:00
Robert Millan
69ac6c405a
Merge from trunk
2009-12-04 00:04:41 +00:00
Robert Millan
6b8474f8e8
2009-12-04 Robert Millan <rmh.grub@aybabtu.com>
...
* commands/halt.c: Replace misc arch-specific headers with
`<grub/misc.h>'.
* commands/reboot.c: Likewise.
* commands/i386/pc/halt.c: Replace `<grub/machine/init.h>' with
`<grub/misc.h>'.
* conf/i386-coreboot.rmk (kernel_img_HEADERS): Remove `cpu/reboot.h'.
(halt_mod_SOURCES): Move `kern/i386/halt.c' from here ...
(kernel_img_SOURCES): ... to here.
* include/grub/efi/efi.h (grub_reboot, grub_halt): Remove prototypes.
* include/grub/i386/pc/init.h: Likewise.
* include/grub/powerpc/ieee1275/kernel.h: Likewise.
* include/grub/sparc64/ieee1275/kernel.h: Likewise.
* include/grub/misc.h (grub_reboot, grub_halt): New prototypes.
* include/grub/i386/halt.h: Remove.
* include/grub/i386/reboot.h: Likewise.
* kern/i386/halt.c: Remove `<grub/cpu/halt.h>'.
2009-12-03 23:07:29 +00:00
Vladimir 'phcoder' Serbinenko
d907b33ca4
merged relocators to ppc
2009-12-03 22:51:02 +01:00
Vladimir 'phcoder' Serbinenko
02ddd45afc
Fix compilation issue for ppc
2009-12-03 22:45:41 +01:00
David S. Miller
4b2e6ca2b6
2009-12-03 David S. Miller <davem@sunset.davemloft.net>
...
* conf/sparc64-ieee1275.rmk (grub_mkimage_SOURCES,
grub_setup_SOURCES, grub_ofpathname_SOURCES): Add gnulib/progname.c
* util/sparc64/ieee1275/grub-mkimage.c: Include <grub/i18n.h> and
"progname.h"
* util/sparc64/ieee1275/grub-ofpathname.c: Likewise.
* util/sparc64/ieee1275/grub-setup.c: Likewise.
(usage): Add missing comma in printf.
2009-12-03 12:18:56 +01:00