Vladimir 'phcoder' Serbinenko
89784252dc
merge gfxmenu+multiterm into exp
2010-01-06 22:22:04 +01:00
Vladimir 'phcoder' Serbinenko
ec647fb940
Merge mainline into gfxmenu+multiterm
2010-01-06 22:19:52 +01:00
Vladimir 'phcoder' Serbinenko
f0cfb703b8
Initial bidi support for gfxmenu
2010-01-06 20:37:16 +01:00
Vladimir 'phcoder' Serbinenko
841353a2f9
merge gfxmenu into gfxmenu+multiterm
2010-01-05 21:25:03 +01:00
Vladimir 'phcoder' Serbinenko
eb1c959440
grub-mkconfig support for themes
2010-01-05 21:24:33 +01:00
Yves Blusseau
6581dd3a58
2010-01-05 Yves Blusseau <yves.blusseau@zetam.org>
...
* util/sparc64/ieee1275/grub-mkimage.c (main): Typo fix.
2010-01-05 18:24:10 +01:00
Colin Watson
3bff18c5c6
2010-01-05 Colin Watson <cjwatson@ubuntu.com>
...
* util/mkisofs/write.c (padblock_write): Switch size and nmemb
arguments to fread so that we get a return value in bytes, rather
than something that will normally be rounded down to 0.
Adjust error handling to avoid producing garbage when size_t is not
the same size as long long.
2010-01-05 16:09:02 +00:00
Vladimir 'phcoder' Serbinenko
e6e86df1de
Merge multiterm into gfxmenu+multiterm
2010-01-05 16:34:10 +01:00
Vladimir 'phcoder' Serbinenko
519634516f
Merge mainline into multiterm
2010-01-05 16:27:41 +01:00
Colin Watson
a136811886
2010-01-05 Colin Watson <cjwatson@ubuntu.com>
...
* util/mkisofs/write.c (padblock_write): Check return value of
fread.
2010-01-05 12:40:30 +00:00
Robert Millan
7c30297857
2010-01-05 Robert Millan <rmh.grub@aybabtu.com>
...
Remove grub-mkfloppy. Images produced by grub-mkrescue are valid
floppy images now.
* util/i386/pc/grub-mkfloppy.in: Remove. Update all users.
2010-01-05 00:31:07 +00:00
Robert Millan
3a73dcb6f5
2010-01-03 Robert Millan <rmh.grub@aybabtu.com>
...
* boot/i386/pc/diskboot.S: Fix inaccurate comment.
* util/i386/pc/grub-setup.c: Include `<assert.h>'.
(struct boot_blocklist): Move from here ...
* include/grub/i386/pc/boot.h [ASM_FILE]
(struct grub_boot_blocklist): ... to here. Update all users.
(setup): Only initialize `start' member of `first_block'
structure. Add assert() calls to verify the other members.
* util/i386/pc/grub-mkimage.c: Include `<assert.h>'.
(generate_image): Fix broken blocklist length initialization.
Add assert() call to verify blocklist `segment' field.
2010-01-03 22:34:03 +00:00
Robert Millan
58bc8bd5b1
2010-01-03 Robert Millan <rmh.grub@aybabtu.com>
...
* boot/i386/pc/boot.S: Update copyright year.
* boot/i386/pc/cdboot.S: Likewise.
* boot/i386/pc/diskboot.S: Likewise.
* boot/i386/pc/lnxboot.S: Likewise.
* boot/i386/pc/pxeboot.S: Likewise.
* bus/pci.c: Likewise.
* commands/cmp.c: Likewise.
* commands/help.c: Likewise.
* commands/hexdump.c: Likewise.
* commands/i386/pc/halt.c: Likewise.
* commands/i386/pc/play.c: Likewise.
* commands/i386/pc/vbeinfo.c: Likewise.
* commands/ls.c: Likewise.
* commands/test.c: Likewise.
* disk/dmraid_nvidia.c: Likewise.
* disk/i386/pc/biosdisk.c: Likewise.
* disk/ieee1275/nand.c: Likewise.
* disk/ieee1275/ofdisk.c: Likewise.
* disk/lvm.c: Likewise.
* disk/raid.c: Likewise.
* disk/raid6_recover.c: Likewise.
* disk/scsi.c: Likewise.
* fs/affs.c: Likewise.
* fs/cpio.c: Likewise.
* fs/ext2.c: Likewise.
* fs/hfs.c: Likewise.
* fs/iso9660.c: Likewise.
* fs/ntfs.c: Likewise.
* fs/sfs.c: Likewise.
* fs/udf.c: Likewise.
* fs/ufs.c: Likewise.
* fs/xfs.c: Likewise.
* gencmdlist.sh: Likewise.
* genmk.rb: Likewise.
* include/grub/disk.h: Likewise.
* include/grub/efi/api.h: Likewise.
* include/grub/efi/efi.h: Likewise.
* include/grub/efi/pe32.h: Likewise.
* include/grub/elf.h: Likewise.
* include/grub/fs.h: Likewise.
* include/grub/i386/at_keyboard.h: Likewise.
* include/grub/i386/pc/memory.h: Likewise.
* include/grub/i386/pc/vbe.h: Likewise.
* include/grub/i386/pci.h: Likewise.
* include/grub/i386/tsc.h: Likewise.
* include/grub/ieee1275/ieee1275.h: Likewise.
* include/grub/ntfs.h: Likewise.
* include/grub/sparc64/ieee1275/ieee1275.h: Likewise.
* include/grub/sparc64/libgcc.h: Likewise.
* include/grub/symbol.h: Likewise.
* include/grub/types.h: Likewise.
* include/multiboot2.h: Likewise.
* io/gzio.c: Likewise.
* kern/device.c: Likewise.
* kern/disk.c: Likewise.
* kern/efi/efi.c: Likewise.
* kern/efi/mm.c: Likewise.
* kern/elf.c: Likewise.
* kern/file.c: Likewise.
* kern/i386/dl.c: Likewise.
* kern/i386/pc/init.c: Likewise.
* kern/i386/pc/startup.S: Likewise.
* kern/ieee1275/ieee1275.c: Likewise.
* kern/ieee1275/init.c: Likewise.
* kern/main.c: Likewise.
* kern/mm.c: Likewise.
* kern/powerpc/dl.c: Likewise.
* kern/sparc64/dl.c: Likewise.
* kern/x86_64/dl.c: Likewise.
* lib/hexdump.c: Likewise.
* loader/efi/appleloader.c: Likewise.
* loader/i386/ieee1275/linux.c: Likewise.
* loader/i386/pc/chainloader.c: Likewise.
* loader/i386/pc/linux.c: Likewise.
* loader/i386/pc/multiboot2.c: Likewise.
* loader/ieee1275/multiboot2.c: Likewise.
* loader/multiboot2.c: Likewise.
* loader/multiboot_loader.c: Likewise.
* loader/powerpc/ieee1275/linux.c: Likewise.
* normal/completion.c: Likewise.
* normal/menu_entry.c: Likewise.
* partmap/apple.c: Likewise.
* util/grub.d/10_hurd.in: Likewise.
* util/hostfs.c: Likewise.
* video/readers/png.c: Likewise.
2010-01-03 22:05:07 +00:00
Yves Blusseau
b1c10d4412
2009-01-01 Yves Blusseau <blusseau@zetam.org>
...
* util/mkisofs/mkisofs.c: fix a warning about a bad cast when NLS
is disabled
2010-01-01 21:41:59 +01:00
Yves Blusseau
2f1a3acf75
2009-01-01 Yves Blusseau <yves.blusseau@zetam.org>
...
* configure.ac: check external intl library
* Makefile.in: add compiler and linker flags to properly compile with
intl library
* include/grub/i18n.h: add a check to disable NLS
* util/misc.c (grub_util_init_nls): new function
* include/grub/util/misc.h: likewise
* util/elf/grub-mkimage.c: use the new function below to initialize NLS
* util/grub-editenv.c: likewise
* util/grub-emu.c: likewise
* util/grub-fstest.c: likewise
* util/grub-mkdevicemap.c: likewise
* util/grub-mkfont.c: likewise
* util/grub-mkrelpath.c: likewise
* util/grub-probe.c: likewise
* util/i386/pc/grub-mkimage.c: likewise
* util/i386/pc/grub-setup.c: likewise
* util/sparc64/ieee1275/grub-mkimage.c: likewise
* util/sparc64/ieee1275/grub-ofpathname.c: likewise
* util/sparc64/ieee1275/grub-setup.c: likewise
* util/mkisofs/mkisofs.h: add a check to disable NLS
* util/mkisofs/mkisofs.c: likewise
2010-01-01 21:32:30 +01:00
Vladimir 'phcoder' Serbinenko
7f1f423cda
merge multiterm gfxmenu+multiterm
2009-12-27 22:38:22 +01:00
Vladimir 'phcoder' Serbinenko
13d1f24696
Fix grub-emu compilation
2009-12-27 22:36:09 +01:00
Vladimir 'phcoder' Serbinenko
bee140683a
Initial effort for gfxmenu on multiterm branch
2009-12-26 01:49:57 +01:00
Vladimir 'phcoder' Serbinenko
9c288be27a
2009-12-25 Vladimir Serbinenko <phcoder@gmail.com>
...
Use search command for preliminar UUID search.
* commands/search.c: Split into ...
* commands/search_wrap.c: ...this
* commands/search.c: ...and this.
* commands/search_file.c: New file.
* commands/search_label.c: New file.
* commands/search_uuid.c: New file.
* conf/any-emu.rmk (grub_emu_SOURCES): Remove commands/search.c.
Add commands/search_wrap.c, commands/search_file.c,
commands/search_label.c and commands/search_uuid.c.
* conf/common.rmk (pkglib_MODULES): Remove fs_uuid.mod and fs_file.mod.
(search_mod_SOURCES): Set to commands/search_wrap.c.
(pkglib_MODULES): Add search_fs_file.mod, search_fs_uuid.mod and
search_label.mod.
(search_fs_file_mod_SOURCES): New variable.
(search_fs_file_mod_CFLAGS): Likewise.
(search_fs_file_mod_LDFLAGS): Likewise.
(search_label_mod_SOURCES): Likewise.
(search_label_mod_CFLAGS): Likewise.
(search_label_mod_LDFLAGS): Likewise.
(search_fs_uuid_mod_SOURCES): New variable.
(search_fs_uuid_mod_CFLAGS): Likewise.
(search_fs_uuid_mod_LDFLAGS): Likewise.
(fs_file_mod_SOURCES): Removed.
(fs_file_mod_CFLAGS): Likewise.
(fs_file_mod_LDFLAGS): Likewise.
(fs_uuid_mod_SOURCES): Removed.
(fs_uuid_mod_CFLAGS): Likewise.
(fs_uuid_mod_LDFLAGS): Likewise.
* conf/sparc64-ieee1275.rmk (grub_install_SOURCES):
Set to util/grub-install.in.
* disk/fs_file.c: Removed.
* disk/fs_uuid.c: Likewise.
* include/grub/search.h: New file.
* util/grub-install.in: Handle sparc64.
Create and use load.cfg.
* util/sparc64/ieee1275/grub-install.in: Removed.
2009-12-25 23:06:52 +01:00
Vladimir 'phcoder' Serbinenko
9f293ab0df
merge mainline into gfxmenu
2009-12-25 21:32:46 +01:00
Felix Zielcke
0ad46fd771
2009-12-25 Felix Zielcke <fzielcke@z-51.de>
...
* util/hostdisk.c (open_device): Fix a comment.
2009-12-25 18:29:17 +01:00
Robert Millan
427d6aa453
Merge my local branch
2009-12-25 12:43:20 +01:00
carles
61ba42be03
2009-12-25 Carles Pina i Estany <carles@pina.cat>
...
* commands/efi/loadbios.c: Capitalize acronyms, replace `could not' by
`couldn't' and `can not' by `cannot'.
* commands/i386/pc/drivemap.c: Likewise.
* disk/ata.c: Likewise.
* disk/ieee1275/nand.c: Likewise.
* fs/affs.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/reiserfs.c: Likewise.
* fs/sfs.c: Likewise.
* fs/udf.c: Likewise.
* fs/ufs.c: Likewise.
* fs/xfs.c: Likewise.
* loader/powerpc/ieee1275/linux.c: Likewise.
* loader/sparc64/ieee1275/linux.c: Likewise.
* util/grub-probe.c: Likewise.
* util/misc.c: Likewise.
2009-12-25 01:04:51 +01:00
Vladimir 'phcoder' Serbinenko
4fc4ee303d
Set default console on non-i386-pc
2009-12-25 00:13:03 +01:00
Robert Millan
d0e158c2f3
2009-12-24 Robert Millan <rmh.grub@aybabtu.com>
...
* util/grub-install.in (host_os): New variable.
* util/i386/efi/grub-install.in (host_os): Likewise.
2009-12-24 22:23:22 +00:00
Robert Millan
401c0ad6fd
2009-12-24 Robert Millan <rmh.grub@aybabtu.com>
...
* util/mkisofs/write.c (padblock_write): Abort when given an
excedingly large embed image, instead of silently truncating it.
2009-12-24 18:00:48 +00:00
Robert Millan
8eca55a6eb
Imported nyu's multi-input
2009-12-24 17:08:14 +01:00
Vladimir 'phcoder' Serbinenko
2e71383172
Core changes hopefully finished
2009-12-24 15:34:33 +01:00
Vladimir 'phcoder' Serbinenko
a2e77ce455
merge mainline into crypto
2009-12-23 20:34:26 +01:00
Vladimir 'phcoder' Serbinenko
0eb11149c9
eliminate dead code and data in des.c
2009-12-23 19:58:33 +01:00
Felix Zielcke
a2c1332b70
2009-12-23 Felix Zielcke <fzielcke@z-51.de>
...
* commands/i386/pc/drivemap.c: Remove all trailing whitespace.
* commands/lspci.c: Likewise.
* commands/probe.c: Likewise.
* commands/xnu_uuid.c: Likewise.
* conf/i386-coreboot.rmk: 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.
* fs/i386/pc/pxe.c: Likewise.
* gettext/gettext.c: Likewise.
* include/grub/efi/graphics_output.h: Likewise.
* include/grub/i386/pc/memory.h: Likewise.
* kern/env.c: Likewise.
* kern/i386/qemu/startup.S: Likewise.
* lib/i386/pc/biosnum.c: Likewise.
* lib/i386/relocator.c: Likewise.
* lib/i386/relocator_asm.S: Likewise.
* lib/relocator.c: Likewise.
* loader/i386/bsd.c: Likewise.
* loader/i386/multiboot.c: Likewise.
* loader/i386/pc/chainloader.c: Likewise.
* loader/i386/xnu.c: Likewise.
* loader/xnu.c: Likewise.
* normal/main.c: Likewise.
* normal/menu_text.c: Likewise.
* util/getroot.c: Likewise.
* util/grub-mkconfig_lib.in: Likewise.
* util/grub.d/00_header.in: Likewise.
* util/i386/pc/grub-mkimage.c: Likewise.
* util/mkisofs/eltorito.c: Likewise.
* util/mkisofs/exclude.h: Likewise.
* util/mkisofs/hash.c: Likewise.
* util/mkisofs/iso9660.h: Likewise.
* util/mkisofs/joliet.c: Likewise.
* util/mkisofs/mkisofs.c: Likewise.
* util/mkisofs/mkisofs.h: Likewise.
* util/mkisofs/multi.c: Likewise.
* util/mkisofs/name.c: Likewise.
* util/mkisofs/rock.c: Likewise.
* util/mkisofs/tree.c: Likewise.
* util/mkisofs/write.c: Likewise.
* video/efi_gop.c: Likewise.
2009-12-23 17:41:32 +01:00
Vladimir 'phcoder' Serbinenko
7316783f35
Crypto module autoloading
2009-12-23 17:33:35 +01:00
Felix Zielcke
990f35486e
2009-12-22 Felix Zielcke <fzielcke@z-51.de>
...
* util/grub-mkrescue.in (pkglib_DATA): Set to @pkglib_DATA@.
* genmk.rb (class SCRIPT): Modify the target file instead of source.
2009-12-22 18:20:27 +01:00
Vladimir 'phcoder' Serbinenko
ba136b293a
merge mainline into crypto
2009-12-22 14:28:39 +01:00
Felix Zielcke
10a8879783
2009-12-22 Felix Zielcke <fzielcke@z-51.de>
...
* genmk.rb (class SCRIPT): Use sed to substitute @pkglib_DATA@
with the actual contents of the correspondending make variable.
* util/grub-mkrescue.in (pkglib_DATA): New variable.
(process_input_dir): Copy all $pkglib_DATA files instead of explicitly
specifying `*.lst' and `efiemu??.o'
2009-12-22 12:12:51 +01:00
Felix Zielcke
7e70dfffc1
2009-12-22 Felix Zielcke <fzielcke@z-51.de>
...
* util/grub.d/30_os-prober.in (osx_entry): Add round brackets
after function name.
Noticed by Rene Engelhard <rene@debian.org>.
2009-12-22 12:02:57 +01:00
Felix Zielcke
82000aa2b2
2009-12-22 Felix Zielcke <fzielcke@z-51.de>
...
* util/grub.d/30_os-prober.in (osx_entry): Remove non POSIX compliant
`function' keyword.
Patch by Tony Mancill <tmancill@debian.org>.
2009-12-22 10:35:04 +01:00
Felix Zielcke
4dd13225a0
2009-12-21 Felix Zielcke <fzielcke@z-51.de>
...
* util/grub-mkrescue.in: (process_input_dir): Copy `*.lst' files
instead of specifying them explicit.
2009-12-21 22:19:25 +01:00
Robert Millan
9b214e3a53
2009-12-21 Robert Millan <rmh.grub@aybabtu.com>
...
* util/mkisofs/msdos_partition.h: New file (based on
include/grub/msdos_partition.h).
* util/mkisofs/mkisofs.c (use_protective_msdos_label): New variable.
(OPTION_PROTECTIVE_MSDOS_LABEL): New macro.
(ld_options, main): Recognize --protective-msdos-label.
* util/mkisofs/mkisofs.h (use_protective_msdos_label): New declaration.
* util/mkisofs/write.c: Include `"msdos_partition.h"'.
(padblock_write): If `use_protective_msdos_label' is set, patch a
protective DOS-style label in the output image.
* util/grub-mkrescue.in: Use --protective-msdos-label.
2009-12-21 20:22:12 +00:00
Robert Millan
e930981361
2009-12-21 Robert Millan <rmh.grub@aybabtu.com>
...
* util/grub-mkrescue.in: Do not zero-pad image for BIOS-based disk
boot.
2009-12-21 19:10:07 +00:00
Robert Millan
0ae5692966
2009-12-21 Robert Millan <rmh.grub@aybabtu.com>
...
* util/mkisofs/mkisofs.c (use_embedded_boot, boot_image_embed): New
variables.
(ld_options, main): Recognize `--embedded-boot'.
* util/mkisofs/mkisofs.h (use_embedded_boot, boot_image_embed): New
declarations.
* util/mkisofs/write.c (PADBLOCK_SIZE): New variable.
(padblock_size): Use `PADBLOCK_SIZE' instead of hardcoding 16.
(padblock_write): Likewise. Rewrite to support embedded boot image.
* util/grub-mkrescue.in: When building i386-pc images, embed core.img
for BIOS-based disk boot instead of only ElTorito.
2009-12-21 17:40:26 +00:00
Robert Millan
b15937b110
2009-12-21 Robert Millan <rmh.grub@aybabtu.com>
...
* util/grub-mkrescue.in: Remove `configfile' and `sh' from i386-pc
build (not needed for bootstrap).
2009-12-21 17:03:08 +00:00
Robert Millan
52cc3ce041
2009-12-21 Robert Millan <rmh.grub@aybabtu.com>
...
* util/grub-mkrescue.in: Remove `memdisk', `tar' and `search' modules
from i386-pc build (not needed for bootstrap).
Rewrite a pair of strings.
2009-12-21 16:11:35 +00:00
Vladimir 'phcoder' Serbinenko
de15bf8e7f
2009-12-20 Vladimir Serbinenko <phcoder@gmail.com>
...
* util/i386/pc/grub-setup.c (setup): Don't install on non-GPT,
non-MSDOS paritions.
2009-12-20 21:08:03 +01:00
Vladimir 'phcoder' Serbinenko
e0a6ca52f2
2009-12-19 Vladimir Serbinenko <phcoder@gmail.com>
...
* include/grub/types.h (UNUSED): Removed since it conflicts with
NetBSD headers. All users changed to direct __attribute__ ((unused)).
Reported by Grégoire Sutre.
2009-12-20 14:09:16 +01:00
Vladimir 'phcoder' Serbinenko
68693c0743
Reimpliment grub-dumpdevtree
2009-12-18 04:57:29 +01:00
Vladimir 'phcoder' Serbinenko
7ea73643f5
merge mtrunk into xnu
2009-12-18 03:57:32 +01:00
Vladimir 'phcoder' Serbinenko
2cd7057fc8
30_os-prober update
2009-12-18 03:33:24 +01:00
Felix Zielcke
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
Robert Millan
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