5b4f655bad
cleaned ATI fixes
2009-12-18 02:11:26 +01:00
b73d4bab7e
Merge trunk into ati
2009-12-18 02:04:10 +01:00
0297aafb9f
2009-12-17 Felix Zielcke <fzielcke@z-51.de>
...
* gendistlist.sh: Use POSIX compliant `!' instead of `-not' in
the `find' command.
2009-12-17 11:19:12 +01:00
db846aed9a
minimalising ATI impact
2009-12-16 16:53:01 +01:00
c179ebe4ee
2009-12-16 Vladimir Serbinenko <phcoder@gmail.com>
...
UUID support for HFS.
* fs/hfs.c (grub_hfs_uuid): New function.
(grub_hfs_fs): New value .uuid.
* include/grub/hfs.h (grub_hfs_sblock): New field 'num_serial'.
2009-12-16 15:40:31 +01:00
8a40612b2c
fix ofconsole palette
2009-12-15 19:57:23 +01:00
7ca3f5c2d9
one more possible fix
2009-12-14 18:16:32 +01:00
574cce0cfa
2009-12-14 Felix Zielcke <fzielcke@z-51.de>
...
Fix a segfault with parsing unknown long options.
* util/grub-mkrelpath.c (options): Zero terminate it.
2009-12-14 11:06:24 +01:00
c4a3e41a72
2009-12-13 Carles Pina i Estany <carles@pina.cat>
...
* include/grub/misc.h (grub_puts): New declaration.
(grub_puts_): Likewise.
* kern/mis.c (grub_puts): New definition.
(grub_puts_): Likewise.
2009-12-13 19:51:08 +00:00
2e8a760287
2009-12-13 Robert Millan <rmh.grub@aybabtu.com>
...
* util/grub-probe.c (probe): Improve error message.
2009-12-13 19:46:59 +00:00
b50b77b9a8
Merge relocator branch
2009-12-13 18:37:44 +00:00
616da3a154
2009-12-13 Robert Millan <rmh.grub@aybabtu.com>
...
* loader/i386/multiboot_elfxx.c
(CONCAT(grub_multiboot_load_elf, XX)): Fix `grub_multiboot_payload_eip'
initialization.
2009-12-13 18:29:15 +00:00
29eb90c620
2009-12-13 Vladimir Serbinenko <phcoder@gmail.com>
...
* kern/i386/pc/startup.S (multiboot_entry): Setup stack before calling
anything.
2009-12-13 18:32:06 +01:00
3e8c081543
legacy-like stack handling
2009-12-13 18:10:53 +01:00
5a0e0cc6bd
Fix XNU resume.
2009-12-13 18:07:01 +01:00
087793c68e
Cleanup address expressions for readability and using only unsigned arithmetics
2009-12-13 18:03:46 +01:00
3102743011
2009-12-13 Carles Pina i Estany <carles@pina.cat>
...
* script/execute.c (grub_script_execute_cmdline): Set grub_errno to
GRUB_ERR_NONE before calling grub_env_set.
2009-12-13 12:35:20 +00:00
dc0c71d974
2009-12-12 Robert Millan <rmh@aybabtu.com>
...
* gendistlist.sh (EXTRA_DISTFILES): Add `genvideolist.sh'.
* genmk.rb (video): New variable.
(CLEANFILES, VIDEOFILES): Add #{video}.
(#{video}): New target rule.
* genvideolist.sh: New file.
* Makefile.in (pkglib_DATA): Add video.lst.
(video.lst): New target rule.
* util/grub-mkconfig.in: Initialize ${GRUB_VIDEO_BACKEND} using
`video.lst'.
* util/grub.d/30_os-prober.in: Replace `vbe' with
${GRUB_VIDEO_BACKEND}.
2009-12-12 00:43:32 +00:00
03157a273d
util/sparc64/ieee1275/grub-install.in was meant to be removed
2009-12-12 00:10:38 +00:00
37ba589a4e
Merge from trunk
2009-12-12 00:07:45 +00:00
cb0573b750
Merge from trunk
2009-12-11 23:11:58 +00:00
cbf73baaae
Indentation fix & missing copyright year.
2009-12-11 23:10:57 +00:00
2a4bfcf0da
2009-12-11 Robert Millan <rmh.grub@aybabtu.com>
...
* THANKS: Add David Miller.
2009-12-11 22:44:47 +00:00
dfec2d96f9
Merge from trunk
2009-12-11 21:20:00 +00:00
2a3aa4d570
Merge pciaccess branch
2009-12-11 21:12:57 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
c0a6bd447e
fix *-emu build
2009-12-05 20:45:32 +01:00
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
fd39f820fd
fix mismerge with trunk (progname)
2009-12-05 18:59:36 +01:00
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
7d624c2949
merge mainline into crypto
2009-12-05 16:34:27 +01:00
9d1fafb96e
Move include/grub/cipher_wrap.h to lib/libgcrypt_wrap/cipher_wrap.h
2009-12-05 16:33:39 +01:00
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
e420686f13
Ignore some VBE info
2009-12-05 11:29:47 +01:00
f616f51c3c
2009-12-05 Vladimir Serbinenko <phcoder@gmail.com>
...
* configure.ac (TARGET_ASFLAGS): Add "-D<MACHINE>".
2009-12-05 11:08:26 +01:00
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
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
Vladimir 'phcoder' Serbinenko