Vladimir 'phcoder' Serbinenko
7d624c2949
merge mainline into crypto
2009-12-05 16:34:27 +01: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
181aaf0e59
Merged mainline into pci
2009-11-30 19:09:11 +01:00
Vladimir 'phcoder' Serbinenko
53e08cc54c
Merged mainstream into newuuid
2009-11-25 23:50:54 +01:00
Vladimir 'phcoder' Serbinenko
0e8489094a
mainstream merged into pci
2009-11-25 15:15:30 +01:00
Vladimir 'phcoder' Serbinenko
59f746dc5f
merged mainstream into crypto
2009-11-24 02:54:35 +01:00
Vladimir 'phcoder' Serbinenko
4996893238
definition fixes
2009-11-23 21:15:44 +01:00
Robert Millan
f84b481b35
Cheery-pick grub-emu split from experimental (rev 1361)
...
2009-11-23 Robert Millan <rmh.grub@aybabtu.com>
* configure.ac: Detect all `emu' platforms. Define
GRUB_MACHINE_* macros in TARGET_CFLAGS. Remove
--enable-grub-emu logic. Disable include/grub/machine
symlink on `emu' platforms.
* genkernsyms.sh.in: Use @TARGET_CFLAGS@ during symbol generation.
* gensymlist.sh.in: Likewise.
* include/grub/i386/coreboot/machine.h: Remove file.
* include/grub/i386/efi/machine.h: Likewise.
* include/grub/i386/ieee1275/machine.h: Likewise.
* include/grub/i386/pc/machine.h: Likewise.
* include/grub/i386/qemu/machine.h: Likewise.
* include/grub/powerpc/ieee1275/machine.h: Likewise.
* include/grub/sparc64/ieee1275/machine.h: Likewise.
* include/grub/x86_64/efi/machine.h: Likewise.
* commands/acpi.c: Remove `<grub/machine/machine.h>'.
* commands/halt.c: Likewise.
* commands/reboot.c: Likewise.
* include/grub/autoefi.h: Likewise.
* include/grub/i386/at_keyboard.h: Likewise.
* include/grub/i386/kernel.h: Likewise.
* include/grub/i386/loader.h: Likewise.
* include/grub/i386/pc/memory.h: Likewise.
* kern/dl.c: Likewise.
* kern/i386/coreboot/init.c: Likewise.
* loader/i386/bsd.c: Likewise.
* loader/i386/linux.c: Likewise.
* loader/multiboot_loader.c: Likewise.
* term/i386/pc/serial.c: Likewise.
* term/usb_keyboard.c: Likewise.
* include/grub/time.h [!GRUB_MACHINE_EMU]: Remove
`<grub/machine/machine.h>'
[!GRUB_MACHINE_EMU] (GRUB_TICKS_PER_SECOND): New macro.
* util/misc.c: Remove `<grub/machine/machine.h>' and
`<grub/machine/time.h>'.
* Makefile.in (enable_grub_emu): Remove variable.
Include $(srcdir)/conf/any-emu.mk for the `emu' platform.
* conf/any-emu.rmk: New file.
* conf/common.rmk (grub_emu_init.lst, grub_emu_init.h)
(grub_emu_init.c): Move from here ...
* conf/any-emu.rmk: ... to here.
* conf/i386-coreboot.rmk (sbin_UTILITIES): Remove `grub-emu'.
(grub_emu_SOURCES, grub_emu_LDFLAGS): Move from here ...
* conf/any-emu.rmk: ... to here.
2009-11-23 15:31:54 +00:00
Vladimir 'phcoder' Serbinenko
5acc2aba78
merged mainline into PCI
2009-11-23 11:15:24 +01:00
Vladimir 'phcoder' Serbinenko
937d332db3
compile and configuration fixes
2009-11-22 13:15:49 +01:00
Vladimir 'phcoder' Serbinenko
4fe6aa0961
synced with mainstream
2009-11-22 12:11:17 +01:00
Vladimir 'phcoder' Serbinenko
f78821e5bc
Removed extraneous copyright line
2009-11-19 23:10:40 +01:00
Robert Millan
cd4f42b0c1
2009-11-19 Robert Millan <rmh.grub@aybabtu.com>
...
Patch from Joe Auricchio <jauricchio@gmail.com>
* commands/minicmd.c (grub_mini_cmd_clear): New function.
(GRUB_MOD_INIT(minicmd)): Register grub_mini_cmd_clear().
(GRUB_MOD_FINI(minicmd)): Unregister grub_mini_cmd_clear().
2009-11-19 10:39:14 +00:00
Vladimir 'phcoder' Serbinenko
0e3c54a5c5
PBKDF2 passwords available
2009-11-24 02:36:21 +01:00
Vladimir 'phcoder' Serbinenko
53eb42a6fa
Compilation error fixed
2009-11-15 23:42:11 +01:00
Vladimir 'phcoder' Serbinenko
228734ab02
MAX_PASSLEN based authentication
2009-11-15 23:36:42 +01:00
Vladimir 'phcoder' Serbinenko
df48e9e18d
REimport of videomask patch
2009-11-14 16:25:50 +01:00
Vladimir 'phcoder' Serbinenko
414f919237
Various cleanups and wrapper functions. Allocate disk id for LUKS.
2009-11-12 18:08:44 +01:00
Vladimir 'phcoder' Serbinenko
20de16bb91
bugfix burn_stack
2009-11-10 20:47:06 +01:00
Vladimir 'phcoder' Serbinenko
1d3c6f1de7
Manually reimported XNU branch
2009-11-09 18:43:53 +01:00
Vladimir 'phcoder' Serbinenko
d65f6db1f7
small fixes
2009-11-06 23:02:08 +01:00
Vladimir 'phcoder' Serbinenko
9b0a46a19d
Cleaned up extended lspci
2009-11-06 22:53:07 +01:00
Vladimir 'phcoder' Serbinenko
cdef0f7f52
improved lspci
2009-11-02 23:44:22 +01:00
fzielcke
fdcdde1905
2009-10-28 Felix Zielcke <fzielcke@z-51.de>
...
* commands/acpi.c (grub_cmd_acpi): Fix the out of memory error
strings.
2009-10-28 18:24:10 +00:00
phcoder
cd2851b3dd
2009-10-15 Vladimir Serbinenko <phcoder@gmail.com>
...
* commands/xnu_uuid.c (grub_cmd_xnu_uuid): Remove duplicated bitwise
operations.
2009-10-15 12:26:30 +00:00
phcoder
325c8258e7
lspci works in grub-emu
2009-10-14 10:36:37 +02:00
phcoder
3affd0ece8
libpci initial stuff
2009-10-14 10:11:59 +02:00
robertmh
5c936493d3
2009-10-09 Robert Millan <rmh.grub@aybabtu.com>
...
Fail gracefuly when attempting to load 64-bit kFreeBSD on IA32 CPU.
* include/grub/i386/cpuid.h: New file.
* commands/i386/cpuid.c: Include `<grub/i386/cpuid.h>'.
(has_longmode): Rename to ...
(grub_cpuid_has_longmode): ... this. Update all users. Remove
`static' attribute.
* loader/i386/bsd.c: Include `<grub/i386/cpuid.h>'.
(grub_bsd_load_elf): Fail if load of 64-bit kernel was requested
on a CPU that doesn't implement AMD64 instruction set.
2009-10-09 17:57:02 +00:00
phcoder
dab7cb4913
missed files
2009-09-22 09:29:32 +02:00
phcoder
063e925fb0
split search
2009-09-22 09:27:59 +02:00
cjwatson
07197f2322
2009-09-14 Colin Watson <cjwatson@ubuntu.com>
...
* commands/test.c (get_fileinfo): Return immediately if
grub_fs_probe fails.
2009-09-14 19:57:45 +00:00
robertmh
dabf179886
2009-09-14 José Martínez <xosemp@gmail.com>
...
* commands/acpi.c (grub_cmd_acpi): Fix loading ACPI tables from file.
2009-09-14 15:38:30 +00:00
cjwatson
f3e8cdfd49
2009-09-02 Colin Watson <cjwatson@ubuntu.com>
...
* commands/keystatus.c (GRUB_MOD_INIT (keystatus)): Adjust summary
to avoid implying that only one of --shift, --ctrl, or --alt may be
used.
2009-09-02 09:14:20 +00:00
phcoder
aa0f752dfe
2009-09-01 Vladimir Serbinenko <phcoder@gmail.com>
...
* commands/loadenv.c (check_blocklists): Fix off-by-one error.
(write_blocklists): Likewise.
2009-09-01 19:07:42 +00:00
cjwatson
4cbe67e509
2009-08-28 Colin Watson <cjwatson@ubuntu.com>
...
2009-08-28 Robert Millan <rmh.grub@aybabtu.com>
Add `getkeystatus' terminal method. Add a new `keystatus' command
to query it.
* include/grub/term.h (GRUB_TERM_STATUS_SHIFT,
GRUB_TERM_STATUS_CTRL, GRUB_TERM_STATUS_ALT): Definitions for
modifier key bitmasks.
(struct grub_term_input): Add `getkeystatus' member.
(grub_getkeystatus): Add prototype.
* kern/term.c (grub_getkeystatus): New function.
* include/grub/i386/pc/memory.h
(GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR): New macro.
(struct grub_machine_bios_data_area): Define necessary parts of BIOS
Data Area layout.
* term/i386/pc/console.c (grub_console_getkeystatus): New function.
(grub_console_term_input): Set `getkeystatus' member.
* term/usb_keyboard.c (grub_usb_hid): Macroify HID protocol
constants.
(grub_usb_keyboard_getreport): Likewise.
(grub_usb_keyboard_checkkey): Likewise.
(grub_usb_keyboard_getkeystatus): New function.
(grub_usb_keyboard_term): Set `getkeystatus' member.
* commands/keystatus.c: New file.
* conf/common.rmk (pkglib_MODULES): Add keystatus.mod.
(keystatus_mod_SOURCES): New variable.
(keystatus_mod_CFLAGS): Likewise.
(keystatus_mod_LDFLAGS): Likewise.
* conf/i386-coreboot.rmk (grub_emu_SOURCES): Add
commands/keystatus.c.
* conf/i386-efi.rmk (grub_emu_SOURCES): Likewise.
* conf/i386-ieee1275.rmk (grub_emu_SOURCES): Likewise.
* conf/i386-pc.rmk (grub_emu_SOURCES): Likewise.
* conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Likewise.
* conf/sparc64-ieee1275.rmk (grub_emu_SOURCES): Likewise.
* conf/x86_64-efi.rmk (grub_emu_SOURCES): Likewise.
* DISTLIST: Add commands/keystatus.c.
2009-08-28 13:20:34 +00:00
phcoder
e7e1f93ff6
2009-08-25 Vladimir Serbinenko <phcoder@gmail.com>
...
Authentication support.
* commands/password.c: New file.
* conf/common.rmk (pkglib_MODULES): Add password.mod.
(password_mod_SOURCES): New variable.
(password_mod_CFLAGS): Likewise.
(password_mod_LDFLAGS): Likewise.
(normal_mod_SOURCES): Add normal/auth.c.
* conf/i386-coreboot.rmk (grub_emu_SOURCES): Add commands/password.c and
normal/auth.c.
* conf/i386-efi.rmk (grub_emu_SOURCES): Likewise.
* conf/i386-ieee1275.rmk (grub_emu_SOURCES): Likewise.
* conf/i386-pc.rmk (grub_emu_SOURCES): Likewise.
* conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Likewise.
* conf/sparc64-ieee1275.rmk (grub_emu_SOURCES): Likewise.
* conf/x86_64-efi.rmk (grub_emu_SOURCES): Likewise.
* include/grub/auth.h: New file.
* include/grub/err.h (grub_err_t): New enum value
GRUB_ERR_ACCESS_DENIED.
* include/grub/menu.h (grub_menu_entry): New fields 'restricted' and
'users'.
* include/grub/normal.h (grub_cmdline_get): New argument 'history'.
* normal/cmdline.c (grub_cmdline_get): New argument 'history'. All
users updated.
* normal/auth.c: New file.
* normal/main.c (grub_normal_add_menu_entry): Handle --users option.
(grub_cmdline_run): Don't allow to go to command line without
authentication.
* normal/menu.c (grub_menu_execute_entry): Handle restricted entries.
* normal/menu_entry.c (grub_menu_entry_run): Don't allow editing
menuentry without superuser rights.
* normal/menu_viewer.c (grub_menu_viewer_show_menu): Don't exit if
user isn't a superuser.
2009-08-24 23:55:06 +00:00
phcoder
e9a925da69
2009-08-23 Vladimir Serbinenko <phcoder@gmail.com>
...
* commands/search.c (search_fs): Try searching without autoload first.
* util/grub-mkconfig_lib.in (prepare_grub_to_access_device): Load
filesystem module explicitly for faster booting.
2009-08-23 15:27:07 +00:00
robertmh
71acf5e54b
2009-08-23 Robert Millan <rmh.grub@aybabtu.com>
...
* partmap/pc.c: Rename to ...
* partmap/msdos.c: ... this. Update all users.
(grub_pc_partition_map): Rename to ...
(grub_msdos_partition_map): ... this. Update all users.
* parttool/pcpart.c: Rename to ...
* parttool/msdospart.c: ... this. Update all users.
* include/grub/pc_partition.h: Rename to ...
* include/grub/msdos_partition.h: ... this. Update all users.
(grub_pc_partition_bsd_entry): Rename to ...
(grub_msdos_partition_bsd_entry): ... this. Update all users.
(grub_pc_partition_disk_label): Rename to ...
(grub_msdos_partition_disk_label): ... this. Update all users.
(grub_pc_partition_entry): Rename to ...
(grub_msdos_partition_entry): ... this. Update all users.
(grub_pc_partition_mbr): Rename to ...
(grub_msdos_partition_mbr): ... this. Update all users.
(grub_pc_partition): Rename to ...
(grub_msdos_partition): ... this. Update all users.
(grub_pc_partition_is_empty): Rename to ...
(grub_msdos_partition_is_empty): ... this. Update all users.
(grub_pc_partition_is_extended): Rename to ...
(grub_msdos_partition_is_extended): ... this. Update all users.
(grub_pc_partition_is_bsd): Rename to ...
(grub_msdos_partition_is_bsd): ... this. Update all users.
* conf/common.rmk (amiga_mod_SOURCES, amiga_mod_CFLAGS)
(amiga_mod_LDFLAGS, apple_mod_SOURCES, apple_mod_CFLAGS)
(apple_mod_LDFLAGS, msdos_mod_SOURCES, msdos_mod_CFLAGS)
(msdos_mod_LDFLAGS, sun_mod_SOURCES, sun_mod_CFLAGS)
(sun_mod_LDFLAGS, acorn_mod_SOURCES, acorn_mod_CFLAGS)
(acorn_mod_LDFLAGS, gpt_mod_SOURCES, gpt_mod_CFLAGS)
(gpt_mod_LDFLAGS): Rename to ...
(part_amiga_mod_SOURCES, part_amiga_mod_CFLAGS, part_amiga_mod_LDFLAGS)
(part_apple_mod_SOURCES, part_apple_mod_CFLAGS, part_apple_mod_LDFLAGS)
(part_msdos_mod_SOURCES, part_msdos_mod_CFLAGS, part_msdos_mod_LDFLAGS)
(part_sun_mod_SOURCES, part_sun_mod_CFLAGS, part_sun_mod_LDFLAGS)
(part_acorn_mod_SOURCES, part_acorn_mod_CFLAGS, part_acorn_mod_LDFLAGS)
(part_gpt_mod_SOURCES, part_gpt_mod_CFLAGS)
(part_gpt_mod_LDFLAGS): ... this.
(pkglib_MODULES): Prefix partition modules with `part_'. Rename
`pcpart.mod' to `msdospart.mod'.
(pcpart_mod_SOURCES, pcpart_mod_CFLAGS, pcpart_mod_LDFLAGS): Rename
to ...
(msdospart_mod_SOURCES, msdospart_mod_CFLAGS)
(msdospart_mod_LDFLAGS): ... this.
2009-08-23 12:00:57 +00:00
phcoder
11d1c76966
2009-08-22 Vladimir Serbinenko <phcoder@gmail.com>
...
* commands/xnu_uuid.c (transform): Use grub_memcpy instead of memcpy.
2009-08-22 17:47:16 +00:00
phcoder
d3539132cd
2009-08-14 Vladimir Serbinenko <phcoder@gmail.com>
...
Framebuffer split.
* commands/i386/pc/vbetest.c (grub_cmd_vbetest): Restore video
subsystem at the end.
* conf/common.rmk (pkglib_MODULES): Add video_fb.mod.
(video_fb_mod_SOURCES): New variable.
(video_fb_mod_CFLAGS): Likewise.
(video_fb_mod_LDFLAGS): Likewise.
* conf/i386-pc.rmk (vbe_mod_SOURCES): Remove video/i386/pc/vbeblit.c,
video/i386/pc/vbefill.c and video/i386/pc/vbeutil.c.
* video/i386/pc/vbeblit.c: Moved from here ...
* video/fb/fbblit.c: ..here. Replaced 'vbe' with 'fb'.
* video/i386/pc/vbefill.c: Moved from here ...
* video/fb/fbfill.c: ..here. Replaced 'vbe' with 'fb'.
* video/i386/pc/vbeutil.c: Moved from here ...
* video/fb/fbutil.c: ..here. Replaced 'vbe' with 'fb'.
* include/grub/i386/pc/vbeblit.h: Moved from here ...
* include/grub/fbblit.h: ... here. Replaced 'vbe' with 'fb'.
* include/grub/i386/pc/vbefill.h: Moved from here ...
* include/grub/fbfill.h: ... here. Replaced 'vbe' with 'fb'.
* include/grub/i386/pc/vbeutil.h: Moved from here ...
* include/grub/fbutil.h: ... here. Replaced 'vbe' with 'fb'.
* include/grub/i386/pc/vbe.h: Moved framebuffer part ...
* include/grub/video_fb.h: ... here. Replaced 'vbe' with 'fb'.
* include/grub/video.h (GRUB_VIDEO_RENDER_TARGET_FRONT_BUFFER): Removed.
(GRUB_VIDEO_RENDER_TARGET_BACK_BUFFER): Likewise.
(grub_video_adapter): Added 'get_info_and_fini'.
(grub_video_get_info_and_fini): New prototype.
(grub_video_set_mode): make modestring const char *.
* loader/i386/linux.c (grub_linux_setup_video): Use
grub_video_get_info_and_fini.
(grub_linux_boot): Move modesetting just before booting.
* loader/i386/pc/xnu.c (grub_xnu_set_video): Use
grub_video_get_info_and_fini.
* video/i386/pc/vbe.c: Moved framebuffer part ...
* video/fb/video_fb.c: ... here. Replaced 'vbe' with 'fb'.
* video/i386/pc/vbe.c (grub_vbe_set_video_mode): Use
grub_video_fbstd_colors and grub_video_fb_set_palette.
(grub_video_vbe_init): Clear 'framebuffer' variable and use
grub_video_fb_init.
(grub_video_vbe_fini): Use grub_video_fb_fini.
(grub_video_vbe_setup): Use framebuffer.render_target instead of
render_target and use grub_video_fb_set_active_render_target and
grub_video_fb_set_palette.
(grub_video_vbe_set_palette): Use grub_video_fb_set_palette.
(grub_video_vbe_set_viewport): Use grub_video_fb_set_viewport.
(grub_video_vbe_adapter): Use framebuffer.
* video/video.c (grub_video_get_info_and_fini): New function.
(grub_video_set_mode): Make modestring const char *.
(GRUB_MOD_INIT(video_video)): Don't set variables to 0 since these
values are already initialised.
2009-08-14 12:41:58 +00:00
fzielcke
222671b22e
2009-08-04 Felix Zielcke <fzielcke@z-51.de>
...
* commands/search.c: Fix help output to match actual code.
2009-08-04 20:10:28 +00:00
phcoder
f84114f583
2009-08-02 Vladimir Serbinenko <phcoder@gmail.com>
...
* commands/hexdump.c (grub_cmd_hexdump): Use grub_disk_read instead
of homegrown code.
2009-08-02 21:57:26 +00:00
phcoder
6ad6258a28
2009-08-01 Vladimir Serbinenko <phcoder@gmail.com>
...
2009-08-01 Robert Millan <rmh.grub@aybabtu.com>
Fix cpuid command.
* commands/i386/cpuid.c (options): New variable.
(grub_cmd_cpuid): Return real error.
(GRUB_MOD_INIT(cpuid)): Declare options.
2009-08-01 14:30:59 +00:00
phcoder
7ad8c80ee8
2009-07-25 Vladimir Serbinenko <phcoder@gmail.com>
...
* commands/probe.c (GRUB_MOD_INIT (probe)): Remove "[--target=target]"
from help line. It's out of sync with code.
2009-07-25 17:46:38 +00:00
proski
ef3c317f6f
2009-07-23 Pavel Roskin <proski@gnu.org>
...
* commands/xnu_uuid.c (transform): Use GRUB_CPU_WORDS_BIGENDIAN
instead of WORDS_BIGENDIAN. Use grub_le_to_cpu32(), so that the
case of little endian words becomes just an optimization.
Respect const modifier.
(md5_final): Use code that doesn't depend on endianess.
2009-07-24 01:43:10 +00:00
proski
eab58da22c
2009-07-16 Pavel Roskin <proski@gnu.org>
...
* kern/mm.c (grub_zalloc): New function.
(grub_debug_zalloc): Likewise.
* include/grub/mm.h: Declare grub_zalloc() and
grub_debug_zalloc().
* util/misc.c (grub_zalloc): New function.
* bus/usb/uhci.c (grub_uhci_pci_iter): Use grub_zalloc()
instead of grub_malloc(), remove unneeded initializations.
* bus/usb/usbhub.c (grub_usb_hub_add_dev): Likewise.
* commands/extcmd.c (grub_extcmd_dispatcher): Likewise.
* commands/parttool.c (grub_cmd_parttool): Likewise.
* disk/i386/pc/biosdisk.c (grub_biosdisk_open): Likewise.
* disk/raid5_recover.c (grub_raid5_recover): Likewise.
* disk/raid6_recover.c (grub_raid6_recover): Likewise.
* disk/usbms.c (grub_usbms_finddevs): Likewise.
* efiemu/mm.c (grub_efiemu_request_memalign): Likewise.
* efiemu/pnvram.c (grub_efiemu_pnvram): Likewise.
(grub_cmd_efiemu_pnvram): Likewise.
* fs/i386/pc/pxe.c (grub_pxefs_open): Likewise.
* fs/iso9660.c (grub_iso9660_mount): Likewise.
(grub_iso9660_iterate_dir): Likewise.
* fs/jfs.c (grub_jfs_opendir): Likewise.
* fs/ntfs.c (list_file): Likewise.
(grub_ntfs_mount): Likewise.
* kern/disk.c (grub_disk_open): Likewise.
* kern/dl.c (grub_dl_load_core): Likewise.
* kern/elf.c (grub_elf_file): Likewise.
* kern/env.c (grub_env_context_open): Likewise.
(grub_env_set): Likewise.
(grub_env_set_data_slot): Likewise.
* kern/file.c (grub_file_open): Likewise.
* kern/fs.c (grub_fs_blocklist_open): Likewise.
* loader/i386/multiboot.c (grub_module): Likewise.
* loader/xnu.c (grub_xnu_create_key): Likewise.
(grub_xnu_create_value): Likewise.
* normal/main.c (grub_normal_add_menu_entry): Likewise.
(read_config_file): Likewise.
* normal/menu_entry.c (make_screen): Likewise.
* partmap/sun.c (sun_partition_map_iterate): Likewise.
* script/sh/lexer.c (grub_script_lexer_init): Likewise.
* script/sh/script.c (grub_script_parse): Likewise.
* video/bitmap.c (grub_video_bitmap_create): Likewise.
* video/readers/jpeg.c (grub_video_reader_jpeg): Likewise.
* video/readers/png.c (grub_png_output_byte): Likewise.
(grub_video_reader_png): Likewise.
2009-07-16 22:14:09 +00:00
proski
e8e8e4fd88
2009-07-15 Pavel Roskin <proski@gnu.org>
...
* commands/probe.c (options): Typo fix.
2009-07-15 19:30:34 +00:00
proski
7d8a52d3a2
2009-07-07 Pavel Roskin <proski@gnu.org>
...
* commands/search.c (search_file): Merge into ...
(search_fs): ... this. Accept search type as argument.
(grub_cmd_search): Pass search type to search_fs().
2009-07-07 20:13:39 +00:00
proski
99f6804167
2009-07-06 Pavel Roskin <proski@gnu.org>
...
* commands/search.c (search_fs): Fix potential NULL pointer
dereference.
2009-07-07 03:05:01 +00:00
proski
4a11b60f10
2009-07-06 Pavel Roskin <proski@gnu.org>
...
* commands/search.c (search_fs): Replace QUID macro with quid_fn
function pointer.
2009-07-06 20:13:06 +00:00
proski
e110f4dea7
2009-07-06 Daniel Mierswa <impulze@impulze.org>
...
* commands/search.c (search_fs): Use grub_strcasecmp() for UUID
comparison.
2009-07-06 20:07:58 +00:00
robertmh
cc3752ad73
(search_file): Improve error message.
...
(GRUB_MOD_INIT(search)): Add missing `-n' to help output.
2009-06-22 20:19:13 +00:00
robertmh
c952cf92a1
2009-06-22 Robert Millan <rmh.grub@aybabtu.com>
...
* commands/search.c (grub_cmd_search): Macroify hardcoded args[]
indexes. Check for -f explicitly.
2009-06-22 19:44:38 +00:00
phcoder
26de2bcdf2
2009-06-18 Vladimir Serbinenko <phcoder@gmail.com>
...
Fix build with Apple's toolchain. Part 1
* commands/i386/pc/drivemap_int13h.S: use assembly-time constants
for long calls
* configure.ac: remove a leftover AC_MSG_RESULT
(CFLAGS): don't add -Wl,--defsym,___main=0x8100 when building with
Apple's toolchain
2009-06-18 14:02:23 +00:00
fzielcke
0644f96c9f
2009-06-16 James Jarvis <James.Jarvis@ed.ac.uk>
...
* commands/help.c GRUB_MOD_INIT(echo): Fix the help output of
`echo' command.
2009-06-16 16:06:49 +00:00
phcoder
693fe63766
2009-06-16 Vladimir Serbinenko <phcoder@gmail.com>
...
xnu_uuid command
* commands/xnu_uuid.c: new file
* conf/common.rmk (pkglib_MODULES): add xnu_uuid.mod
(xnu_uuid_mod_SOURCES): new variable
(xnu_uuid_mod_CFLAGS): likewise
(xnu_uuid_mod_LDFLAGS): likewise
* conf/i386-coreboot.rmk (grub_emu_SOURCES): add commands/probe.c
* conf/i386-ieee1275.rmk: likewise
* conf/i386-pc.rmk: likewise
* conf/powerpc-ieee1275.rmk: likewise
* conf/sparc64-ieee1275.rmk: likewise
* util/grub.d/30_os-prober.in: use UUID for Mac OS X/Darwin
2009-06-15 22:57:39 +00:00
phcoder
9c6f459688
2009-06-16 Vladimir Serbinenko <phcoder@gmail.com>
...
Probe command
* commands/probe.c: new file
* conf/common.rmk (pkglib_MODULES): add probe.mod
(probe_mod_SOURCES): new variable
(probe_mod_CFLAGS): likewise
(probe_mod_LDFLAGS): likewise
* conf/i386-coreboot.rmk (grub_emu_SOURCES): add commands/probe.c
* conf/i386-ieee1275.rmk: likewise
* conf/i386-pc.rmk: likewise
* conf/powerpc-ieee1275.rmk: likewise
* conf/sparc64-ieee1275.rmk: likewise
2009-06-15 22:41:42 +00:00
phcoder
3a1acfe21d
2009-06-12 Vladimir Serbinenko <phcoder@gmail.com>
...
* commands/i386/pc/drivemap_int13h.S: add more comments
2009-06-12 18:22:38 +00:00
proski
3daba08cfa
Fix spacing
2009-06-12 06:12:38 +00:00
phcoder
63963d17d0
2009-06-11 Vladimir Serbinenko <phcoder@gmail.com>
...
Drivemap fixes
* commands/i386/pc/drivemap.c (grub_get_root_biosnumber_drivemap):
new function
(grub_get_root_biosnumber_saved): new variable
(GRUB_MOD_INIT): register grub_get_root_biosnumber_drivemap
(GRUB_MOD_FINI): unregister grub_get_root_biosnumber_drivemap
* commands/i386/pc/drivemap_int13h.S (grub_drivemap_handler): restore
%dx after the call if necessary
* conf/common.rmk (pkglib_MODULES): remove boot.mod
(boot_mod_SOURCES): remove
(boot_mod_CFLAGS): remove
(boot_mod_LDFLAGS): remove
* conf/i386-coreboot.rmk (pkglib_MODULES): add boot.mod
(boot_mod_SOURCES): new variable
(boot_mod_CFLAGS): likewise
(boot_mod_LDFLAGS): likewise
* conf/i386-efi.rmk: likewise
* conf/i386-ieee1275.rmk: likewise
* conf/i386-pc.rmk: likewise
* conf/powerpc-ieee1275.rmk: likewise
* conf/sparc64-ieee1275.rmk: likewise
* conf/x86_64-efi.rmk: likewise
* include/grub/i386/pc/biosnum.h: new file
* lib/i386/pc/biosnum.c: likewise
* loader/i386/bsd.c (grub_bsd_get_device): use grub_get_root_biosnumber
* loader/i386/multiboot.c (grub_multiboot_get_bootdev): likewise
* loader/i386/pc/chainloader.c (grub_chainloader_cmd): likewise
2009-06-11 16:13:39 +00:00
proski
5c5215d5e2
2009-06-10 Pavel Roskin <proski@gnu.org>
...
* kern/file.c (grub_file_read): Use void pointer for the buffer.
Adjust all callers.
2009-06-10 23:47:49 +00:00
fzielcke
b39f9d20a9
remove all trailing whitespace
2009-06-10 21:04:23 +00:00
fzielcke
ba5a0d059b
2009-06-08 Felix Zielcke <fzielcke@z-51.de>
...
* commands/true.c: New file. Implement the true and false commands.
* conf/common.rmk.c (pkglib_MODULES): Add `true.mod'.
(true_mod_SOURCES): New variable.
(true_mod_CFLAGS): Likewise.
(true_mod_LDFLAGS): Likewise.
2009-06-08 07:32:14 +00:00
phcoder
3e32590112
2009-06-04 Vladimir Serbinenko <phcoder@gmail.com>
...
Absolute addressing through constant with Apple's cc
* kern/i386/pc/startup.S: Define necessary constants
and address through it when using ABS with Apple's CC
* boot/i386/pc/diskboot.S: likewise
* boot/i386/pc/boot.S: likewise
* boot/i386/pc/lnxboot.S: likewise
* boot/i386/pc/cdboot.S: likewise
* mmap/i386/pc/mmap_helper.S: likewise
* commands/i386/pc/drivemap_int13h.S: likewise
2009-06-04 20:01:19 +00:00
phcoder
3eb5ed4ec0
2009-06-04 Vladimir Serbinenko <phcoder@gmail.com>
...
gfxpayload support
* commands/videotest.c (grub_cmd_videotest): use grub_video_set_mode
* include/grub/video.h (GRUB_VIDEO_MODE_TYPE_PURE_TEXT): new definition
(grub_video_setup): remove
(grub_video_set_mode): new prototype
* loader/i386/linux.c (DEFAULT_VIDEO_MODE): new definition
(vid_mode): remove
(linux_vesafb_res): compile only on PCBIOS
(grub_linux_boot): support gfxpayload
* loader/i386/pc/xnu.c (video_hook): new function
(grub_xnu_set_video): support gfxpayload
* term/gfxterm.c (DEFAULT_VIDEO_WIDTH): removed
(DEFAULT_VIDEO_HEIGHT): likewise
(DEFAULT_VIDEO_FLAGS): likewise
(DEFAULT_VIDEO_MODE): new definition
(video_hook): new function
(grub_gfxterm_init): use grub_video_set_mode
* util/grub.d/30_os-prober.in: remove explicit modesetting before
loading xnu
* video/video.c (grub_video_setup): removed
(grub_video_set_mode): new function based on grub_gfxterm_init and
grub_video_setup
2009-06-04 18:22:45 +00:00
phcoder
4b0e1143bb
2009-06-04 Vladimir Serbinenko <phcoder@gmail.com>
...
Avoid calling biosdisk in drivemap
* commands/i386/pc/drivemap.c (parse_biosdisk): remove
(revparse_biosdisk): likewise
(list_mappings): derive name from id directly
(grub_cmd_drivemap): use tryparse_diskstring
2009-06-04 16:56:29 +00:00
robertmh
f4448a0792
2009-06-04 Robert Millan <rmh.grub@aybabtu.com>
...
Prevent GRUB from probing floppies during boot.
* conf/common.rmk (search_mod_CFLAGS): Use `-Werror -Wall'.
* commands/search.c (options): Add --no-floppy.
(search_fs, search_file, grub_cmd_search): Support --no-floppy.
* util/grub-mkconfig_lib.in (prepare_grub_to_access_device): Use
--no-floppy when searching for UUIDs.
2009-06-04 11:37:44 +00:00
robertmh
2bf5885a3d
2009-06-04 Robert Millan <rmh.grub@aybabtu.com>
...
Simplify the code duplication in commands/search.c.
* commands/search.c (search_label, search_fs_uuid): Merge into ...
(search_fs): ... this. Update all users.
2009-06-04 11:18:18 +00:00
fzielcke
861f03a5b9
2009-05-23 Felix Zielcke <fzielcke@z-51.de>
...
* commands/i386/pc/drivemap.c (MODNAME): Remove. Update all users.
2009-05-23 20:51:09 +00:00
proski
5cb5c9c210
Remove incorrect comment that the code must be position independent.
2009-05-15 14:47:44 +00:00
chrfranke
cf353a4742
2009-05-14 Christian Franke <franke@computer.org>
...
* commands/i386/pc/drivemap_int13h.S: Add missing EXT_C for symbols.
This fixes build on Cygwin.
2009-05-14 21:56:46 +00:00
proski
3834887fb2
2009-05-14 Pavel Roskin <proski@gnu.org>
...
* commands/i386/pc/drivemap_int13h.S: Eliminate unconditional
jump. This saves two bytes, so the typical case of 2 swapped
drives would fit 32 bytes.
2009-05-14 13:43:13 +00:00
proski
4246b8a9e8
2009-05-13 Javier Martín <lordhabbit@gmail.com>
...
* commands/i386/pc/drivemap.c: New file - implement drivemap
command.
* commands/i386/pc/drivemap_int13h.S: New file - int13 handler.
* conf/i386-pc.rmk: Add drivemap.c and drivemap_int13h.S.
2009-05-14 01:23:49 +00:00
proski
238e871fff
2009-05-13 Pavel Roskin <proski@gnu.org>
...
* kernel/disk.c (grub_disk_read): Use void pointer for the
buffer.
(grub_disk_write): Use const void pointer for the buffer.
Adjust all callers. Remove unnecessary casts.
2009-05-13 18:58:38 +00:00
phcoder
2eac4c1611
2009-05-09 Vladimir Serbinenko <phcoder@gmail.com>
...
gptsync
* commands/gptsync.c: new file
* conf/common.rmk (pkglib_MODULES): add gptsync.mod
(gptsync_mod_SOURCES): new variable
(gptsync_mod_CFLAGS): likewise
(gptsync_mod_LDFLAGS): likewise
* include/grub/pc_partition.h (GRUB_PC_PARTITION_TYPE_NTFS):
new definition
(GRUB_PC_PARTITION_TYPE_HFS): likewise
* conf/i386-coreboot.rmk (grub_emu_SOURCES): add commands/gptsync.c
* conf/i386-ieee1275.rmk: likewise
* conf/i386-pc.rmk: likewise
* conf/powerpc-ieee1275.rmk: likewise
2009-05-09 11:04:08 +00:00
proski
119494b506
2009-05-05 Pavel Roskin <proski@gnu.org>
...
* include/grub/dl.h [GRUB_UTIL]: Provide inline implementations
of grub_dl_ref() and grub_dl_unref().
* commands/parttool.c: Remove preprocessor conditionals around
grub_dl_ref() and grub_dl_unref().
* fs/affs.c: Likewise.
* fs/afs.c: Likewise.
* fs/cpio.c: Likewise.
* fs/ext2.c: Likewise.
* fs/fat.c: Likewise.
* fs/hfs.c: Likewise.
* fs/hfsplus.c: Likewise.
* fs/iso9660.c: Likewise.
* fs/jfs.c: Likewise.
* fs/minix.c: Likewise.
* fs/ntfs.c: Likewise.
* fs/reiserfs.c: Likewise.
* fs/sfs.c: Likewise.
* fs/udf.c: Likewise.
* fs/ufs.c: Likewise.
* fs/xfs.c: Likewise.
* include/grub/dl.h: Likewise.
* loader/xnu.c: Likewise.
2009-05-05 16:36:58 +00:00
proski
de5fd76e95
2009-05-04 Pavel Roskin <proski@gnu.org>
...
* commands/acpi.c: Remove unused variable my_mod.
* partmap/amiga.c: Likewise.
* partmap/apple.c: Likewise.
* partmap/gpt.c: Likewise.
* partmap/pc.c: Likewise.
* partmap/sun.c: Likewise.
* term/gfxterm.c: Likewise.
* term/i386/pc/vesafb.c: Likewise.
* term/i386/pc/vga.c: Likewise.
2009-05-04 23:33:34 +00:00
proski
4241d2b13a
2009-05-04 Pavel Roskin <proski@gnu.org>
...
* disk/ata.c: Spelling fixes.
* disk/raid.c: Likewise.
* disk/usbms.c: Likewise.
* disk/dmraid_nvidia.c: Likewise.
* kern/ieee1275/openfw.c: Likewise.
* kern/ieee1275/init.c: Likewise.
* kern/ieee1275/cmain.c: Likewise.
* boot/i386/pc/cdboot.S: Likewise.
* video/readers/png.c: Likewise.
* video/i386/pc/vbe.c: Likewise.
* fs/udf.c: Likewise.
* fs/hfs.c: Likewise.
* fs/reiserfs.c: Likewise.
* efiemu/runtime/efiemu.c: Likewise.
* efiemu/main.c: Likewise.
* efiemu/mm.c: Likewise.
* include/grub/elf.h: Likewise.
* include/grub/xnu.h: Likewise.
* include/grub/usbdesc.h: Likewise.
* include/grub/usb.h: Likewise.
* include/grub/script_sh.h: Likewise.
* include/grub/lib/LzmaEnc.h: Likewise.
* include/grub/efiemu/efiemu.h: Likewise.
* include/grub/command.h: Likewise.
* normal/menu.c: Likewise.
* normal/main.c: Likewise.
* normal/datetime.c: Likewise.
* bus/usb/uhci.c: Likewise.
* mmap/i386/uppermem.c: Likewise.
* mmap/mmap.c: Likewise.
* commands/acpi.c: Likewise.
* commands/test.c: Likewise.
* partmap/apple.c: Likewise.
* font/font.c: Likewise.
* loader/sparc64/ieee1275/linux.c: Likewise.
* loader/macho.c: Likewise.
* loader/i386/bsd_trampoline.S: Likewise.
* loader/i386/bsd.c: Likewise.
* loader/xnu.c: Likewise.
* term/i386/pc/vesafb.c: Likewise.
* term/usb_keyboard.c: Likewise.
* util/resolve.c: Likewise.
* util/getroot.c: Likewise.
2009-05-04 20:06:05 +00:00
proski
4c402e7301
2009-05-03 Pavel Roskin <proski@gnu.org>
...
* disk/ata.c: Don't cast mod to void in GRUB_MOD_INIT to
suppress warnings. It's no longer needed.
* disk/host.c: Likewise.
* disk/ata_pthru.c: Likewise.
* disk/loopback.c: Likewise.
* hook/datehook.c: Likewise.
* parttool/pcpart.c: Likewise.
* fs/i386/pc/pxe.c: Likewise.
* fs/ntfscomp.c: Likewise.
* efiemu/main.c: Likewise.
* mmap/mmap.c: Likewise.
* commands/crc.c: Likewise.
* commands/hexdump.c: Likewise.
* commands/hdparm.c: Likewise.
* commands/acpi.c: Likewise.
* commands/echo.c: Likewise.
* commands/minicmd.c: Likewise.
* commands/blocklist.c: Likewise.
* commands/memrw.c: Likewise.
* commands/loadenv.c: Likewise.
* commands/usbtest.c: Likewise.
* commands/lsmmap.c: Likewise.
* commands/boot.c: Likewise.
* commands/parttool.c: Likewise.
* commands/configfile.c: Likewise.
* commands/search.c: Likewise.
* commands/ieee1275/suspend.c: Likewise.
* commands/cat.c: Likewise.
* commands/i386/pc/pxecmd.c: Likewise.
* commands/i386/pc/play.c: Likewise.
* commands/i386/pc/halt.c: Likewise.
* commands/i386/pc/vbeinfo.c: Likewise.
* commands/i386/pc/vbetest.c: Likewise.
* commands/lspci.c: Likewise.
* commands/date.c: Likewise.
* commands/handler.c: Likewise.
* commands/ls.c: Likewise.
* commands/test.c: Likewise.
* commands/cmp.c: Likewise.
* commands/efi/loadbios.c: Likewise.
* commands/efi/fixvideo.c: Likewise.
* commands/halt.c: Likewise.
* commands/help.c: Likewise.
* commands/reboot.c: Likewise.
* hello/hello.c: Likewise.
* script/sh/main.c: Likewise.
* loader/xnu.c: Likewise.
* term/terminfo.c: Likewise.
* term/i386/pc/serial.c: Likewise.
* term/usb_keyboard.c: Likewise.
2009-05-04 03:49:08 +00:00
phcoder
f8efe3ad2d
2009-05-02 Vladimir Serbinenko <phcoder@gmail.com>
...
ACPI spoofing
* commands/acpi.c: new file
* commands/i386/pc/acpi.c: likewise
* commands/efi/acpi.c: likewise
* include/grub/acpi.h: likewise
* conf/i386-pc.rmk (pkglib_MODULES): added acpi.mod
(acpi_mod_SOURCES): new variable
(acpi_mod_CFLAGS): likewise
(acpi_mod_LDFLAGS): likewise
* conf/i386-efi.rmk: likewise
* conf/x86_64-efi.rmk: likewise
2009-05-02 22:31:29 +00:00
davem
979b4fb416
* commands/lsmmap.c (grub_cmd_lsmmap): Add casts to avoid printf
...
warnings.
* kern/ieee1275/openfw.c (grub_claimmap): Likewise.
* disk/ieee1275/ofdisk.c (grub_ofdisk_open, grub_ofdisk_close,
grub_ofdisk_read): Likewise, and deal similarly with the fact that
ihandles have a 32-bit type but need to be stored in a "void *".
2009-04-30 01:18:43 +00:00
phcoder
75a807cf00
2009-04-27 Vladimir Serbinenko <phcoder@gmail.com>
...
Preboot hooks support
* commands/boot.c (struct grub_preboot_t): new declaration
(preboots_head): new variable
(preboots_tail): likewise
(grub_loader_register_preboot_hook): new function
(grub_loader_unregister_preboot_hook): likewise
(grub_loader_set): launch preboot hooks
* include/grub/loader.h (grub_loader_preboot_hook_prio_t): new type
(grub_loader_register_preboot_hook): new declaration
(grub_loader_unregister_preboot_hook): likewise
2009-04-27 16:48:58 +00:00
phcoder
a5562c306f
2009-04-26 Vladimir Serbinenko <phcoder@gmail.com>
...
Bug and warning fixes
* include/grub/i386/pc/init.h (grub_stop_floppy): added missing
declaration
* commands/test.c (test_parse): fixed bug with file tests and corrected
declaration of find_file
2009-04-26 15:09:30 +00:00
phcoder
033b10a80a
2009-04-25 Vladimir Serbinenko <phcoder@gmail.com>
...
Test command
* commands/test.c: rewritten to use bash-like test
2009-04-25 12:29:08 +00:00
phcoder
e434359358
2009-04-25 Vladimir Serbinenko <phcoder@gmail.com>
...
Parttool autoloading and improvements
* Makefile.in (pkglib_DATA): add parttool.lst
(parttool.lst): new target
* genmk.rb: generate parttool-*
(CLEANFILES): add #{parttool}
(PARTTOOLFILES): new variable
* genparttoollist.sh: new file
* parttool/pcpart.c (grub_pcpart_boot): more feedback
(grub_pcpart_type): likewise
* commands/parttool.c (helpmsg): new variable
(grub_cmd_parttool): output help if not enough arguments are supplied
autoload modules
(GRUB_MOD_INIT(parttool)): use helpmsg
2009-04-25 12:18:25 +00:00
proski
d1a282fc83
2009-04-17 Pavel Roskin <proski@gnu.org>
...
* disk/ata.c (grub_ata_pciinit): Use NESTED_FUNC_ATTR.
* bus/usb/ohci.c (grub_ohci_pci_iter): Likewise.
* bus/usb/uhci.c (grub_uhci_pci_iter): Likewise.
* commands/lspci.c (grub_lspci_iter): Likewise.
2009-04-17 15:36:41 +00:00
bean
a96df3f249
2009-04-16 Bean <bean123ch@gmail.com>
...
* commands/efi/loadbios.c (grub_cmd_fakebios): Add missing return
value.
2009-04-16 12:18:11 +00:00
phcoder
0d5d565326
2009-04-15 Vladimir Serbinenko <phcoder@gmail.com>
...
Move loader out of the kernel
* kern/loader.c: moved to ...
* commands/boot.c: ... moved here
* commands/minicmd.c (grub_mini_cmd_boot): moved to ...
* commands/boot.c (grub_cmd_boot): moved here. All users updated
* include/grub/kernel.h (grub_machine_fini): export
* include/grub/loader.h (grub_loader_is_loaded): update declaration
(grub_loader_set): likewise
(grub_loader_unset): likewise
(grub_loader_boot): likewise
* conf/common.rmk: new module boot.mod
(pkglib_MODULES): add boot.mod
* conf/i386-coreboot.rmk (kernel_elf_SOURCES): remove kern/loader.c
(grub_emu_SOURCES): likewise
* conf/i386-efi.rmk (kernel_elf_SOURCES): likewise
(grub_emu_SOURCES): likewise
* conf/i386-ieee1275.rmk (kernel_elf_SOURCES): likewise
(grub_emu_SOURCES): likewise
* conf/i386-pc.rmk (kernel_elf_SOURCES): likewise
(grub_emu_SOURCES): likewise
* conf/powerpc-ieee1275.rmk (kernel_elf_SOURCES): likewise
(grub_emu_SOURCES): likewise
* conf/sparcs64-ieee1275.rmk (kernel_elf_SOURCES): likewise
(grub_emu_SOURCES): likewise
* conf/x86_64-efi.rmk (kernel_elf_SOURCES): likewise
(grub_emu_SOURCES): likewise
2009-04-15 12:45:50 +00:00
bean
e7e6862a4c
2009-04-10 Bean <bean123ch@gnail.com>
...
* include/grub/efi/api.h (grub_efi_configuration_table): Add packed
attribute, otherwise the size would be wrong for i386 platform.
* include/grub/pci.h (grub_pci_read_word): New inline function.
(grub_pci_read_byte): Likewise.
(grub_pci_write): Likewise.
(grub_pci_write_word): Likewise.
(grub_pci_write_byte): Likewise.
* include/grub/pci.h (grub_pci_iteratefunc_t): Add NESTED_FUNC_ATTR.
* loader/i386/efi/linux.c (fake_bios_data): Moved to loadbios module.
(find_framebuf): Scan pci to locate the frame buffer address.
* commands/efi/fixvideo.c: New file.
* commands/efi/loadbios.c: Likewise.
* commands/memrw.c: Likewise.
* util/grub-dumpbios.in: Likewise.
* conf/common.rmk (grub-dumpbios): New utility.
(pkglib_MODULES): New module memrw.mod.
(memrw_mod_SOURCE): New macro.
(memrw_mod_CFLAGS): Likewise.
(memrw_mod_LDFLAGS): Likewise.
* conf/i386-efi.rmk (pkglig_MODULES): New module loadbios.mod and
fixvideo.mod.
(loadbios_mod_SOURCE): New macro.
(loadbios_mod_CFLAGS): Likewise.
(loadbios_mod_LDFLAGS): Likewise.
(fixvideo_mod_SOURCE): Likewise.
(fixvideo_mod_CFLAGS): Likewise.
(fixvideo_mod_LDFLAGS): Likewise.
* conf/x86_64.rmk (pkglig_MODULES): New module loadbios.mod and
fixvideo.mod.
(loadbios_mod_SOURCE): New macro.
(loadbios_mod_CFLAGS): Likewise.
(loadbios_mod_LDFLAGS): Likewise.
(fixvideo_mod_SOURCE): Likewise.
(fixvideo_mod_CFLAGS): Likewise.
(fixvideo_mod_LDFLAGS): Likewise.
2009-04-10 15:33:34 +00:00
proski
761319cfd3
2009-04-06 Pavel Roskin <proski@gnu.org>
...
* commands/help.c (print_command_help): Use cmd->prio, not
cmd->flags to check for GRUB_PRIO_LIST_FLAG_ACTIVE.
2009-04-06 16:15:36 +00:00
phcoder
ea761d4014
2009-04-06 Vladimir Serbinenko <phcoder@gmail.com>
...
Parttool
* parttool/pcpart.c: new file
* commands/parttool.c: likewise
* conf/common.rmk (pkglib_MODULES): Added parttool.mod and pcpart.mod
(parttool_mod_SOURCES): new variable
(parttool_mod_CFLAGS): likewise
(parttool_mod_LDFLAGS): likewise
(pcpart_mod_SOURCES): likewise
(pcpart_mod_CFLAGS): likewise
(pcpart_mod_LDFLAGS): likewise
* conf/i386-coreboot.rmk (grub_emu_SOURCES): added commands/parttool.c
and parttool/pcpart.c
* conf/i386-efi.rmk: likewise
* conf/i386-ieee1275.rmk: likewise
* conf/i386-pc.rmk: likewise
* conf/powerpc-ieee1275.rmk: likewise
* conf/sparc64-ieee1275.rmk: likewise
* conf/x86_64-ieee1275.rmk: likewise
2009-04-06 09:51:01 +00:00
phcoder
05aaebfb7b
2009-04-05 Vladimir Serbinenko <phcoder@gmail.com>
...
Support for mtime and further expandability of dir command
* include/grub/lib/datetime.h: moved to ...
* include/grub/datetime.h: ... moved here and added
declaration of grub_unixtime2datetime. All users updated
* include/grub/fs.h: new syntax for dir and mtime functionin
struct grub_fs
* include/grub/fshelp.h: new declarations of GRUB_FSHELP_TYPE_MASK
and GRUB_FSHELP_FLAGS_MASK
* commands/ls.c (grub_ls_list_files): Write mtime in long format
* fs/ext2.c (grub_ext2_dir): use new dir syntax and supply mtime
(grub_ext2_mtime): new function
* fs/hfsplus.c (grub_hfsplus_dir): use new dir syntax and supply mtime
(grub_hfsplus_mtime): new function
* fs/ufs.c (GRUB_UFS_ATTR_TYPE): new definition
(GRUB_UFS_ATTR_FILE): likewise
(GRUB_UFS_ATTR_LNK): likewise
(struct grub_ufs_sblock): new fields mtime
(grub_ufs_read_inode): new parameter to read inode to a separate buffer
all users updated
(grub_ufs_dir): mtime support
(grub_ufs_mtime): new function
* fs/affs.c (grub_affs_dir): use new dir syntax
* fs/afs.c (grub_afs_dir): likewise
* fs/cpio.c (grub_cpio_dir): likewise
* fs/fat.c (grub_fat_find_dir): likewise
* fs/hfs.c (grub_hfs_dir): likewise
* fs/iso9660.c (grub_iso9660_dir): likewise
* fs/jfs.c (grub_jfs_dir): likewise
* fs/minix.c (grub_minix_dir): likewise
* fs/ntfs.c (grub_ntfs_dir): likewise
* fs/reiserfs.c (grub_reiserfs_dir): likewise
* fs/sfs.c (grub_sfs_dir): likewise
* fs/xfs.c (grub_xfs_dir): likewise
* util/hostfs.c (grub_hostfs_dir): likewise
* lib/datetime.c: moved to ...
* normal/datetime.c: ... moved here
(grub_unixtime2datetime): new function
* kern/rescue.c (grub_rescue_print_files): use new dir syntax
* normal/completition.c (iterate_dir): use new dir syntax
* normal/misc.c (grub_normal_print_device_info): tell the
last modification time of a volume
* kern/fs.c (grub_fs_probe): updated dummy function to use new syntax
* conf/common.rmk: added lib/datetime.c to ls.mod
* conf/i386-coreboot.rmk (grub_emu_SOURCES): add normal/datetime.c
(normal_mod_SOURCES): likewise
(datetime_mod_SOURCES): Removed lib/datetime.c
* conf/i386-efi.rmk: likewise
* conf/i386-ieee1275.rmk: likewise
* conf/i386-pc.rmk: likewise
* conf/powerpc-ieee1275.rmk: likewise
* conf/sparc64-ieee1275.rmk: likewise
* conf/x86_64-efi.rmk: likewise
2009-04-05 20:19:05 +00:00
okuji
6842cec424
Undo r2063.
2009-04-04 09:22:35 +00:00
bean
838c454296
2009-04-04 Bean <bean123ch@gnail.com>
...
* include/grub/efi/api.h (grub_efi_configuration_table): Add packed
attribute, otherwise the size would be wrong for i386 platform.
* include/grub/pci.h (grub_pci_read_word): New inline function.
(grub_pci_read_byte): Likewise.
(grub_pci_write): Likewise.
(grub_pci_write_word): Likewise.
(grub_pci_write_byte): Likewise.
* include/grub/pci.h (grub_pci_iteratefunc_t): Add NESTED_FUNC_ATTR.
* loader/i386/efi/linux.c (fake_bios_data): Moved to loadbios module.
(find_framebuf): Scan pci to locate the frame buffer address.
* commands/efi/fixvideo.c: New file.
* commands/efi/loadbios.c: Likewise.
* commands/memrw.c: Likewise.
* util/grub-dumpbios.in: Likewise.
* conf/common.rmk (grub-dumpbios): New utility.
(pkglib_MODULES): New module memrw.mod.
(memrw_mod_SOURCE): New macro.
(memrw_mod_CFLAGS): Likewise.
(memrw_mod_LDFLAGS): Likewise.
* conf/i386-efi.rmk (pkglig_MODULES): New module loadbios.mod and
fixvideo.mod.
(loadbios_mod_SOURCE): New macro.
(loadbios_mod_CFLAGS): Likewise.
(loadbios_mod_LDFLAGS): Likewise.
(fixvideo_mod_SOURCE): Likewise.
(fixvideo_mod_CFLAGS): Likewise.
(fixvideo_mod_LDFLAGS): Likewise.
* conf/x86_64.rmk (pkglig_MODULES): New module loadbios.mod and
fixvideo.mod.
(loadbios_mod_SOURCE): New macro.
(loadbios_mod_CFLAGS): Likewise.
(loadbios_mod_LDFLAGS): Likewise.
(fixvideo_mod_SOURCE): Likewise.
(fixvideo_mod_CFLAGS): Likewise.
(fixvideo_mod_LDFLAGS): Likewise.
2009-04-04 08:08:01 +00:00
okuji
5709cfc4d1
2009-03-29 Yoshinori K. Okuji <okuji@enbug.org>
...
Make the format of Environment Block plain text. The boot loader
part is not tested well yet.
* util/grub-editenv.c (DEFAULT_ENVBLK_SIZE): New macro.
(buffer): Removed.
(envblk): Likewise.
(usage): Remove "info" and "clear". Add "unset". Update the
description of "set", as this does not delete variables any
longer.
(create_envblk_file): Complete rewrite.
(open_envblk_file): Likewise.
(cmd_info): Removed.
(cmd_list): Likewise.
(cmd_set): Likewise.
(cmd_clear): Likewise.
(list_variables): New function.
(write_envblk): Likewise.
(set_variables): Likewise.
(unset_variables): Likewise.
(main): Complete rewrite.
* commands/loadenv.c (buffer): Removed.
(envblk): Likewise.
(open_envblk_file): New function.
(read_envblk_file): Complete rewrite.
(grub_cmd_load_env): Likewise.
(grub_cmd_list_env): Likewise.
(struct blocklist): New struct.
(free_blocklists): New function.
(check_blocklists): Likewise.
(write_blocklists): Likewise.
(grub_cmd_save_env): Complete rewrite.
* include/grub/lib/envblk.h (GRUB_ENVBLK_SIGNATURE): Replaced with
a plain text signature.
(GRUB_ENVBLK_MAXLEN): Removed.
(struct grub_envblk): Complete rewrite.
(grub_envblk_find): Removed.
(grub_envblk_insert): Likewise.
(grub_envblk_open): New prototype.
(grub_envblk_set): Likewise.
(grub_envblk_delete): Put const to VALUE.
(grub_envblk_iterate): Put const to NAME and VALUE.
(grub_envblk_close): New prototype.
(grub_envblk_buffer): New inline function.
(grub_envblk_size): Likewise.
* lib/envblk.c: Include grub/mm.h.
(grub_env_find): Removed.
(grub_envblk_open): New function.
(grub_envblk_close): Likewise.
(escaped_value_len): Likewise.
(find_next_line): Likewise.
(grub_envblk_insert): Removed.
(grub_envblk_set): New function.
(grub_envblk_delete): Complete rewrite.
(grub_envblk_iterate): Likewise.
2009-03-28 19:58:15 +00:00
okuji
42a5b3fcc7
2009-03-22 Yoshinori K. Okuji <okuji@enbug.org>
...
* kern/env.c (grub_env_context_open): Added an argument to specify
whether a new context inherits exported variables from current
one. This is useful when making a sandbox to interpret a config
file.
All callers updated.
* include/grub/env.h (grub_env_context_open): Updated the prototype.
2009-03-22 10:45:06 +00:00
okuji
f04f02e496
2009-03-22 Yoshinori K. Okuji <okuji@enbug.org>
...
* normal/main.c (grub_normal_execute): Added an argument
BATCH to specify if an interactive interface should be provided
after reading a config file.
All callers updated.
(read_command_list): Prevent being executed twice.
(read_fs_list): Likewise.
* include/grub/normal.h (grub_normal_execute):
2009-03-22 10:05:31 +00:00
bean
b1b797cb1b
2009-03-21 Bean <bean123ch@gmail.com>
...
* commands/blocklist.c: Add include file <grub/command.h>, remove
<grub/normal.h> and <grub/arg.h>.
(grub_cmd_blocklist): Use the new command interface.
(GRUB_MOD_INIT): Likewise.
(GRUB_MOD_FINI): Likewise.
* commands/boot.c: Likewise.
* commands/cat.c: Likewise.
* commands/cmp.c: Likewise.
* commands/configfile.c: Likewise.
* commands/crc.c: Likewise.
* commands/echo.c: Likewise.
* commands/halt.c: Likewise.
* commands/handler.c: Likewise.
* commands/hdparm.c: Likewise.
* commands/help.c: Likewise.
* commands/hexdump.c: Likewise.
* commands/loadenv.c: Likewise.
* commands/ls.c: Likewise.
* commands/lsmmap.c: Likewise.
* commands/lspci.c: Likewise.
* commands/loadenv.c: Likewise.
* commands/read.c: Likewise.
* commands/reboot.c: Likewise.
* commands/search.c: Likewise.
* commands/sleep.c: Likewise.
* commands/test.c: Likewise.
* commands/usbtest.c: Likewise.
* commands/videotest.c: Likewise.
* commands/i386/cpuid.c: Likewise.
* commands/i386/pc/halt.c: Likewise.
* commands/i386/pc/play.c: Likewise.
* commands/i386/pc/pxecmd.c: Likewise.
* commands/i386/pc/vbeinfo.c: Likewise.
* commands/i386/pc/vbetest.c: Likewise.
* commands/ieee1275/suspend.c: Likewise.
* disk/loopback.c: Likewise.
* font/font_cmd.c: Likewise.
* hello/hello.c: Likewise.
* loader/efi/appleloader.c: Likewise.
* loader/efi/chainloader.c: Likewise.
* loader/i386/bsd.c: Likewise.
* loader/i386/efi/linux.c: Likewise.
* loader/i386/ieee1275/linux.c: Likewise.
* loader/i386/linux.c: Likewise.
* loader/i386/pc/chainloader.c: Likewise.
* loader/i386/pc/linux.c: Likewise.
* loader/powerpc/ieee1275/linux.c: Likewise.
* loader/multiboot_loader.c: Likewise.
* term/gfxterm.c: Likewise.
* term/i386/pc/serial.c: Likewise.
* term/terminfo.c: Likewise.
* term/i386/pc/vesafb.c: Removed <grub/arg.h>.
* term/i386/pc/vga.c: Likewise.
* video/readers/jpeg.c: Likewise.
* video/readers/png.c: Likewise.
* video/readers/tga.c: Likewise.
* util/grub-fstest (cmd_loopback): Removed.
(cmd_blocklist): Likewise.
(cmd_ls): Likewise.
(grub_register_command): Likewise.
(grub_unregister_command): Likewise.
(execute_command): Use grub_command_find to locate command and execute
it.
* include/grub/efi/chainloader.h: Removed.
* loader/efi/chainloader_normal.c: Likewise.
* loader/i386/bsd_normal.c: Likewise.
* loader/i386/pc/chainloader_normal.c: Likewise.
* loader/i386/pc/multiboot_normal.c: Likewise.
* loader/linux_normal.c: Likewise.
* loader/multiboot_loader_normal.c: Likewise.
* loader/powerpc/ieee1275/linux_normal.c: Likewise.
* gencmdlist.sh: Scan new registration command grub_register_extcmd
and grub_register_command_p1.
* conf/common.rmk (grub_fstest_SOURCES): Add kern/list.c,
kern/command.c, lib/arg.c and commands/extcmd.c.
(pkglib_MODULES): Remove boot.mod, and minicmd.mod and extcmd.mod.
(minicmd_mod_SOURCES): New variable.
(minicmd_mod_CFLAGS): Likewise.
(minicmd_mod_LDFLAGS): Likewise.
(extcmd_mod_SOURCES): Likewise.
(extcmd_mod_CFLAGS): Likewise.
(extcmd_mod_LDFLAGS): Likewise.
(boot_mod_SOURCES): Removed.
(boot_mod_CFLAGS): Likewise.
(boot_mod_LDFLAGS): Likewise.
* conf/i386-pc.rmk (kernel_img_SOURCES): Add kern/command.c and
kern/corecmd.c.
(kernel_img_HEADERS): Add command.h.
(grub_emu_SOURCES): Remove commands/boot.c and normal/arg.c, add
commands/minicmd.c, kern/command.c, kern/corecmd.c, commands/extcmd.c
and lib/arg.c.
(pkglib_MODULES): Change _linux.mod, _chain.mod, _bsd.mod and
_multiboot.mod as linux.mod, chain.mod, bsd.mod and multiboot.mod,
remove the corresponding normal mode command.
(normal_mod_SOURCES): Remove normal/arg.c.
* conf/i386-coreboot.rmk: Likewise.
* conf/i386-efi.rmk: Likewise.
* conf/i386-ieee1275.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* include/grub/arg.h: Move from here ...
* include/grub/lib/arg.h: ... to here.
* normal/arg.c: Move from here ...
* lib/arg.c: ... to here.
* commands/extcmd.c: New file.
* commands/minicmd.c: Likewise.
* include/grub/command.h: Likewise.
* include/grub/extcmd.h: Likewise.
* kern/command.c: Likewise.
* kern/corecmd.c: Likewise.
* kern/list.c (grub_list_iterate): Return int instead of void.
(grub_list_insert): New function.
(grub_prio_list_insert): Likewise.
* kern/rescue.c (grub_rescue_command): Removed.
(grub_rescue_command_list): Likewise.
(grub_rescue_register_command): Likewise.
(grub_rescue_unregister_command): Likewise.
(grub_rescue_cmd_boot): Move to minicmd.c
(grub_rescue_cmd_help): Likewise.
(grub_rescue_cmd_info): Likewise.
(grub_rescue_cmd_boot): Likewise.
(grub_rescue_cmd_testload): Likewise.
(grub_rescue_cmd_dump): Likewise.
(grub_rescue_cmd_rmmod): Likewise.
(grub_rescue_cmd_lsmod): Likewise.
(grub_rescue_cmd_exit): Likewise.
(grub_rescue_print_devices): Moved to corecmd.c.
(grub_rescue_print_files): Likewise.
(grub_rescue_cmd_ls): Likewise.
(grub_rescue_cmd_insmod): Likewise.
(grub_rescue_cmd_set): Likewise.
(grub_rescue_cmd_unset): Likewise.
(attemp_normal_mode): Use grub_command_find to get normal module.
(grub_enter_rescue_mode): Use grub_register_core_commands to register
commands, remove grub_rescue_regiter_command calls.
* normal/command.c (grub_regiser_command): Removed.
(grub_unregister_command): Likewise.
(grub_command_find): Likewise.
(grub_iterate_commands): Likewise.
(rescue_command): Likewise.
(export_command): Moved to corecmd.c.
(set_command): Removed.
(unset_command): Likewise.
(insmod_command): Likewise.
(rmmod_command): Likewise.
(lsmod_command): Likewise.
(grub_command_init): Likewise.
* normal/completion.c (iterate_command): Use cmd->prio to check for
active command.
(complete_arguments): Use grub_extcmd_t structure to find options.
(grub_normal_do_completion): Change function grub_iterate_commands to
grub_command_iterate.
* normal/execute.c (grub_script_execute_cmd): No need to parse
argument here.
* normal/main.c (grub_dyncmd_dispatcher): New function.
(read_command_list): Register unload commands as dyncmd.
(grub_cmd_normal): Use new command interface, register rescue,
unregister normal at entry, register normal, unregister rescue at exit.
* include/grub/list.h (grub_list_test_t): New type.
(grub_list_iterate): Return int instead of void.
(grub_list_insert): New function.
(GRUB_AS_NAMED_LIST_P): New macro.
(GRUB_AS_PRIO_LIST): Likewise.
(GRUB_AS_PRIO_LIST_P): Likewise.
(GRUB_PRIO_LIST_PRIO_MASK): New constant.
(GRUB_PRIO_LIST_FLAG_ACTIVE): Likewise.
(grub_prio_list): New structure.
(grub_prio_list_insert): New function.
(grub_prio_list_remove): New inline function.
* include/grub/normal.h: Remove <grub/arg.h>, add <grub/command.h>.
(GRUB_COMMAND_FLAG_CMDLINE): Moved to command.h.
(GRUB_COMMAND_FLAG_MENU): Likewise.
(GRUB_COMMAND_FLAG_BOTH): Likewise.
(GRUB_COMMAND_FLAG_TITLE): Likewise.
(GRUB_COMMAND_FLAG_NO_ECHO): Likewise.
(GRUB_COMMAND_FLAG_NO_ARG_PARSE): Removed.
(GRUB_COMMAND_FLAG_NOT_LOADED): Likewise.
(grub_command): Likewise.
(grub_register_command): Likewise.
(grub_command_find): Likewise.
(grub_iterate_commands): Likewise.
(grub_command_init): Likewise.
(grub_arg_parse): Likewise.
(grub_arg_show_help): Likewise.
* include/grub/rescue.h (grub_rescue_register_command): Removed.
(grub_rescue_unregister_command): Likewise.
* include/grub/i386/bsd.h: Remove grub_rescue_cmd_freebsd,
grub_rescue_cmd_openbsd, grub_rescue_cmd_netbsd,
grub_rescue_cmd_freebsd_loadenv and grub_rescue_cmd_freebsd_module.
* include/grub/i386/efi/loader.h: Remove grub_rescue_cmd_linux and
grub_rescue_cmd_initrd.
* include/grub/i386/loader.h: Likewise.
* include/grub/x86_64/loader.h: Likewise.
* include/grub/i386/pc/chainloader.h: Remove grub_chainloader_cmd.
2009-03-21 08:39:59 +00:00
bean
7e9ca17ace
2009-03-04 Bean <bean123ch@gmail.com>
...
* configure.ac: Only test -mcmodel=large option in x86_64-efi, also add
another option -mno-red-zone.
* commands/handler.c: Change module description.
* kern/handler.c: Add missing space at the end of description line.
* kern/list.c: Likewise.
2009-03-04 05:56:31 +00:00
bean
71b9f36193
2009-03-01 Bean <bean123ch@gmail.com>
...
* commands/terminal.c: Removed.
* commands/handler.c: New file.
* include/grub/list.h: Likewise.
* include/grub/handler.h: Likewise.
* kern/list.c: Likewise.
* kern/handler.c: Likewise.
* kern/term.h: Include header file <grub/handler.h>.
(grub_term_input): Move next field to the beginning.
(grub_term_output): Likewise.
(grub_term_input_class): New variable.
(grub_term_output_class): Likewise.
(grub_term_register_input): Changed to inline function.
(grub_term_register_output): Likewise.
(grub_term_unregister_input): Likewise.
(grub_term_unregister_output): Likewise.
(grub_term_set_current_input): Likewise.
(grub_term_set_current_output): Likewise.
(grub_term_get_current_input): Likewise.
(grub_term_get_current_output): Likewise.
(grub_term_iterate_input): Removed.
(grub_term_iterate_output): Likewise.
* kern/term.c (grub_term_list_input): Removed.
(grub_term_list_output): Likewise.
(grub_term_input_class): New variable.
(grub_term_output_class): Likewise.
(grub_cur_term_input): Change varaible as macro.
(grub_cur_term_output): Likewise.
(grub_term_register_input): Removed.
(grub_term_register_output): Likewise.
(grub_term_unregister_input): Likewise.
(grub_term_unregister_output): Likewise.
(grub_term_set_current_input): Likewise.
(grub_term_set_current_output): Likewise.
(grub_term_iterate_input): Likewise.
(grub_term_iterate_output): Likewise.
(grub_term_get_current_input): Likewise.
(grub_term_get_current_output): Likewise.
* util/grub-editenv.c: Include header file <grub/handler.h>.
(grub_term_get_current_input): Removed.
(grub_term_get_current_output): Likewise.
(grub_term_input_class): New variable.
(grub_term_outout_class): Likewise.
* util/grub-fstest.c (grub_term_get_current_input): Removed.
(grub_term_get_current_output): Likewise.
(grub_term_input_class): New variable.
(grub_term_outout_class): Likewise.
* util/grub-probe.c (grub_term_get_current_input): Removed.
(grub_term_get_current_output): Likewise.
(grub_term_input_class): New variable.
(grub_term_outout_class): Likewise.
* util/i386/pc/grub-setup.c (grub_term_get_current_input): Removed.
(grub_term_get_current_output): Likewise.
(grub_term_input_class): New variable.
(grub_term_outout_class): Likewise.
* conf/common.rmk (pkglib_MODULES): Replace terminal with handler.
(terminal_mod_SOURCES): Likewise.
(terminal_mod_CFLAGS): Likewise.
(terminal_mod_LDFLAGS): Likewise.
* conf/i386-pc.rmk (grub_emu_SOURCES): Replace terminal.c with
handler.c.
(kernel_img_SOURCES): Add list.c and handler.c.
(kernel_img_HEADERS): Add list.h and handler.h.
* conf/i386-efi.rmk (grub_emu_SOURCES): Replace terminal.c with
handler.c.
(kernel_mod_SOURCES): Add list.c and handler.c.
(kernel_mod_HEADERS): Add list.h and handler.h.
* conf/i386-coreboot.rmk (grub_emu_SOURCES): Replace terminal.c with
handler.c.
(kernel_elf_SOURCES): Add list.c and handler.c.
(kernel_elf_HEADERS): Add list.h and handler.h.
* conf/i386-ieee1275.rmk (grub_emu_SOURCES): Replace terminal.c with
handler.c.
(kernel_elf_SOURCES): Add list.c and handler.c.
(kernel_elf_HEADERS): Add list.h and handler.h.
* conf/x86_64-efi.rmk (grub_emu_SOURCES): Replace terminal.c with
handler.c.
(kernel_mod_SOURCES): Add list.c and handler.c.
(kernel_mod_HEADERS): Add list.h and handler.h.
* conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Replace terminal.c with
handler.c.
(kernel_elf_SOURCES): Add list.c and handler.c.
(kernel_elf_HEADERS): Add list.h and handler.h.
2009-03-01 17:51:44 +00:00