robertmh
042484d78e
2009-10-25 Robert Millan <rmh.grub@aybabtu.com>
...
* include/grub/fs.h [GRUB_UTIL] (struct grub_fs): Add
`reserved_first_sector' member.
* fs/ext2.c [GRUB_UTIL] (grub_ext2_fs): Initialize
`reserved_first_sector' to 1.
* fs/fat.c [GRUB_UTIL] (grub_fat_fs): Likewise.
* fs/ntfs.c [GRUB_UTIL] (grub_ntfs_fs): Likewise.
* fs/hfsplus.c [GRUB_UTIL] (grub_hfsplus_fs): Likewise.
* util/i386/pc/grub-setup.c (setup): Add safety check that probes for
filesystems which begin at first sector.
(options): New option --skip-fs-probe.
(main): Handle --skip-fs-probe and pass it to setup().
2009-10-25 15:23:48 +00:00
robertmh
f669389090
2009-10-25 Robert Millan <rmh.grub@aybabtu.com>
...
Patch from Samuel Thibault <samuel.thibault@ens-lyon.org>
* docs/grub.cfg: Compensate for recent change in multiboot
loader (since 2009-08-14 it won't pass filename to payload).
* util/grub.d/10_hurd.in: Likewise.
2009-10-24 23:03:02 +00:00
robertmh
035f712204
2009-10-15 Robert Millan <rmh.grub@aybabtu.com>
...
Make entry text a bit more readable.
* util/grub.d/10_linux.in: Add `with' before `Linux'.
2009-10-15 20:34:27 +00:00
robertmh
e9d66f6d6a
2009-10-14 Robert Millan <rmh.grub@aybabtu.com>
...
* conf/common.rmk (grub-dumpbios): Remove rule.
(sbin_SCRIPTS, CLEANFILES): Remove `grub-dumpbios'.
* util/grub-dumpbios.in: Remove file.
2009-10-14 18:23:40 +00:00
robertmh
9155bc1796
2009-10-14 Robert Millan <rmh.grub@aybabtu.com>
...
Refer to kernel of FreeBSD "kFreeBSD" to avoid confusion between
the Operating System (FreeBSD) and its kernel (kernel of FreeBSD).
* loader/i386/bsd.c (grub_freebsd_boot): Read kernel environment
from "kFreeBSD" namespace (rather than "FreeBSD"). Update all
users.
(GRUB_MOD_INIT (bsd)): Rename "freebsd" command to "kfreebsd",
"openbsd" to "kopenbsd", "netbsd" to "knetbsd", "freebsd_loadenv"
to "kfreebsd_loadenv", "freebsd_module" to "kfreebsd_module",
and "freebsd_module_elf" to "kfreebsd_module_elf". Update all
users.
2009-10-14 16:49:22 +00:00
cjwatson
d244281ce6
2009-10-06 Colin Watson <cjwatson@ubuntu.com>
...
* util/i386/pc/grub-install.in: Source
${libdir}/grub/grub-mkconfig_lib before option processing, in order
that the --grub-probe option will work.
* util/sparc64/ieee1275/grub-install.in: Likewise.
2009-10-05 23:33:36 +00:00
cjwatson
50dcabcf94
2009-10-01 Colin Watson <cjwatson@ubuntu.com>
...
* util/grub-editenv.c (create_envblk_file): Write new block with a
.new suffix and then rename it into place, to ensure atomic
creation.
2009-10-01 18:22:43 +00:00
robertmh
31299a9556
2009-09-26 Robert Millan <rmh.grub@aybabtu.com>
...
* conf/common.rmk (pkglib_MODULES): Remove `lua.mod'.
(lua_mod_SOURCES, lua_mod_CFLAGS, lua_mod_LDFLAGS): Remove.
* util/osdetect.lua: Remove.
* script/lua/lauxlib.c: Likewise.
* script/lua/ldebug.c: Likewise.
* script/lua/grub_main.c: Likewise.
* script/lua/lauxlib.h: Likewise.
* script/lua/ldebug.h: Likewise.
* script/lua/ltablib.c: Likewise.
* script/lua/liolib.c: Likewise.
* script/lua/lstrlib.c: Likewise.
* script/lua/lualib.h: Likewise.
* script/lua/ldo.c: Likewise.
* script/lua/ldump.c: Likewise.
* script/lua/ldo.h: Likewise.
* script/lua/loslib.c: Likewise.
* script/lua/lundump.c: Likewise.
* script/lua/grub_lib.c: Likewise.
* script/lua/ldblib.c: Likewise.
* script/lua/lundump.h: Likewise.
* script/lua/lmem.c: Likewise.
* script/lua/grub_lib.h: Likewise.
* script/lua/lmathlib.c: Likewise.
* script/lua/lstate.c: Likewise.
* script/lua/ltm.c: Likewise.
* script/lua/lvm.c: Likewise.
* script/lua/lmem.h: Likewise.
* script/lua/lstate.h: Likewise.
* script/lua/ltm.h: Likewise.
* script/lua/ltable.c: Likewise.
* script/lua/lvm.h: Likewise.
* script/lua/llex.c: Likewise.
* script/lua/lgc.c: Likewise.
* script/lua/grub_lua.h: Likewise.
* script/lua/loadlib.c: Likewise.
* script/lua/lfunc.c: Likewise.
* script/lua/lopcodes.c: Likewise.
* script/lua/lparser.c: Likewise.
* script/lua/ltable.h: Likewise.
* script/lua/llex.h: Likewise.
* script/lua/lgc.h: Likewise.
* script/lua/lfunc.h: Likewise.
* script/lua/lbaselib.c: Likewise.
* script/lua/lopcodes.h: Likewise.
* script/lua/lparser.h: Likewise.
* script/lua/lzio.c: Likewise.
* script/lua/linit.c: Likewise.
* script/lua/lobject.c: Likewise.
* script/lua/llimits.h: Likewise.
* script/lua/lstring.c: Likewise.
* script/lua/lzio.h: Likewise.
* script/lua/lapi.c: Likewise.
* script/lua/lcode.c: Likewise.
* script/lua/lua.h: Likewise.
* script/lua/lobject.h: Likewise.
* script/lua/lstring.h: Likewise.
* script/lua/lapi.h: Likewise.
* script/lua/lcode.h: Likewise.
* script/lua/luaconf.h: Likewise.
2009-09-26 11:48:55 +00:00
robertmh
6b9b6276d4
2009-09-24 Pavel Roskin <proski@gnu.org>
...
* include/grub/kernel.h (struct grub_module_header): Remove
`grub_module_header_types'. Make `type' unsigned. Make `size'
32-bit on all platforms.
* util/elf/grub-mkimage.c (load_modules): Treat `type' as an
8-bit field. Use grub_host_to_target32() for `size'.
* util/i386/efi/grub-mkimage.c (make_mods_section): Likewise.
* util/i386/pc/grub-mkimage.c (generate_image): Likewise.
* util/sparc64/ieee1275/grub-mkimage.c (generate_image): Likewise.
2009-09-24 13:40:40 +00:00
robertmh
c6dcedf6b2
2009-09-24 Robert Millan <rmh.grub@aybabtu.com>
...
* util/i386/pc/grub-mkimage.c (generate_image): Enclose BIOS-specific
size check within GRUB_MACHINE_PCBIOS section.
2009-09-24 13:22:19 +00:00
fzielcke
d96875df6e
2009-09-23 Felix Zielcke <fzielcke@z-51.de>
...
* util/grub-mkconfig_lib.in (grub_file_is_not_garbage): Cope with `*.dpkg-*'
2009-09-23 09:46:08 +00:00
fzielcke
9b3f836571
2009-09-23 Felix Zielcke <fzielcke@z-51.de>
...
* util/grub-mkconfig_lib.in (grub_file_is_not_garbage): Add support
for `*.dpkg-new'.
2009-09-23 09:26:34 +00:00
fzielcke
5a78865b39
2009-09-21 Felix Zielcke <fzielcke@z-51.de>
...
* util/hostdisk.c: Fix a comment.
2009-09-21 14:03:11 +00:00
cjwatson
a83d079b1e
2009-09-19 Colin Watson <cjwatson@ubuntu.com>
...
* util/grub.d/30_os-prober.in: Don't throw away stderr from
os-prober. Under normal operation, it does not print anything to
stderr; if it does, we need to debug it, and throwing away stderr
makes that excessively difficult.
2009-09-19 14:15:00 +00:00
cjwatson
d52109a7a2
2009-09-14 Colin Watson <cjwatson@ubuntu.com>
...
* util/grub.d/30_os-prober.in: Cope with Windows 7 in os-prober
output.
2009-09-14 11:32:00 +00:00
fzielcke
8aa1541a41
2009-09-10 Felix Zielcke <fzielcke@z-51.de>
...
* util/grub-mkconfig.in: Make the created config mode 400 and
print a warning if it fails.
2009-09-10 19:04:43 +00:00
robertmh
48d9bb0a93
2009-09-10 Robert Millan <rmh.grub@aybabtu.com>
...
* util/grub.d/40_custom.in: Ask user to type custom entries below
comment, rather than below 'exec tail' line.
2009-09-10 12:53:25 +00:00
cjwatson
3b0521bed2
2009-09-10 Colin Watson <cjwatson@ubuntu.com>
...
* util/grub.d/40_custom.in: Make sure that the explanatory text is
visible in grub.cfg.
2009-09-10 12:44:24 +00:00
cjwatson
50051d5542
2009-09-10 Colin Watson <cjwatson@ubuntu.com>
...
* util/grub.d/40_custom.in: Make it a little clearer how to use this
file.
2009-09-10 12:10:33 +00:00
robertmh
7f26d4665b
2009-09-05 Robert Millan <rmh.grub@aybabtu.com>
...
* util/grub-probe.c (probe): Comment out buggy codepath, which
was unexpectedly enabled by Colin Watson's 2009-09-02 fix. This
should be re-enabled after 1.97.
2009-09-05 20:36:49 +00:00
cjwatson
c0bc232b72
2009-09-02 Colin Watson <cjwatson@ubuntu.com>
...
* util/grub-probe.c (probe): Test st.st_mode using S_ISREG macro
rather than comparing against S_IFREG, which will almost never work.
2009-09-02 01:42:06 +00:00
robertmh
c90edae43a
2009-08-29 Robert Millan <rmh.grub@aybabtu.com>
...
* util/grub.d/10_freebsd.in: Detect `ufs1' and `ufs2' and map them
to `ufs' in the vfs.root.mountfrom kernel parameter.
2009-08-29 00:34:33 +00:00
fzielcke
3b76e68ba7
2009-08-25 Felix Zielcke <fzielcke@z-51.de>
...
* util/grub.d/00_header.in: Move check for the video backend of
gfxterm from here ...
* util/grub-mkconfig.in: ... to here. Enable gfxterm if there's
a suitable video backend.
2009-08-25 19:42:56 +00:00
phcoder
aea664ea28
2009-08-25 Vladimir Serbinenko <phcoder@gmail.com>
...
Fix breakage in grub-setup.
* util/i386/pc/grub-setup.c (setup): Use "part_msdos" instead of
"msdos_partition_map".
2009-08-25 08:28:13 +00:00
phcoder
2d21e3e8e0
2009-08-24 Vladimir Serbinenko <phcoder@gmail.com>
...
Rename *_partition_map to part_*
* partmap/acorn.c (grub_acorn_partition_map): Set name to 'part_acorn'.
* partmap/amiga.c (grub_amiga_partition_map): Set name to 'part_amiga'.
* partmap/apple.c (grub_apple_partition_map): Set name to 'part_apple'.
* partmap/gpt.c (grub_gpt_partition_map): Set name to 'part_gpt'.
All users updated.
* partmap/msdos.c (grub_msdos_partition_map): Set name to 'part_msdos'.
All users updated.
* partmap/sun.c (grub_sun_partition_map): Set name to 'part_sun'.
* util/grub-probe.c (probe_partmap): Don't transform partition name
to get module name.
2009-08-24 13:34:03 +00:00
phcoder
0b8e386c09
Revert 2 previous commits.
...
2009-08-23 Vladimir Serbinenko <phcoder@gmail.com>
Fix grub-install.
* util/grub-probe.c (probe_partmap): Prefix partmap with 'part_'.
2009-08-23 23:40:29 +00:00
phcoder
af0f0beafa
2009-08-23 Vladimir Serbinenko <phcoder@gmail.com>
...
Fix grub-install.
* util/i386/efi/grub-install.in: Add 'part_' to partmap_module.
* util/sparc64/ieee1275/grub-install.in: Likewise.
2009-08-23 23:24:33 +00:00
phcoder
cb4735645d
2009-08-23 Vladimir Serbinenko <phcoder@gmail.com>
...
Fix grub-install.
* util/i386/pc/grub-install.in: Add 'part_' to partmap_module.
2009-08-23 21:04:44 +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
fzielcke
5174302b55
2009-08-23 Colin Watson <cjwatson@ubuntu.com>
...
* util/grub-mkconfig.in: Export GRUB_DISABLE_OS_PROBER.
2009-08-23 15:09:05 +00:00
robertmh
c8c80635ae
2009-08-23 Colin Watson <cjwatson@ubuntu.com>
...
* util/grub.d/30_os-prober.in: Disable os-prober if
`GRUB_DISABLE_OS_PROBER' was set to true.
2009-08-23 12:59:22 +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
fzielcke
e53cea1182
2009-08-18 Felix Zielcke <fzielcke@z-51.de>
...
* util/powerpc/ieee1275/grub-mkrescue.in (grub_mkimage): Use
grub-mkelfimage.
2009-08-18 19:50:31 +00:00
proski
9aced5446d
2009-08-18 Felix Zielcke <fzielcke@z-51.de>
...
* util/grub-mkconfig.in: Don't use gfxterm by default if not
explicitly specified by the user.
2009-08-18 17:57:07 +00:00
robertmh
9a10df160e
2009-08-13 Colin Watson <cjwatson@ubuntu.com>
...
* util/grub-mkconfig.in: Export GRUB_HIDDEN_TIMEOUT.
* util/grub.d/00_header.in: Enter interruptible sleep if
GRUB_HIDDEN_TIMEOUT is set.
2009-08-13 20:08:23 +00:00
robertmh
f5d35e7a4b
2009-08-08 Robert Millan <rmh.grub@aybabtu.com>
...
* util/grub-dumpdevtree: Moved from here ...
* util/i386/efi/grub-dumpdevtree: ... to here.
(hexify): New function. Converts a string to its hex version.
Generate hex versions of "efi" and "device-properties" by calling
hexify() on the ASCII strings rather than by hardcoding numbers.
2009-08-08 19:24:58 +00:00
fzielcke
1ebbe064d1
2009-08-08 Felix Zielcke <fzielcke@z-51.de>
...
* util/grub.d/00_header.in: Fix a comment.
* util/grub.d/10_linux.in: Likewise.
* util/grub.d/10_windows.in: Likewise.
* util/grub.d/10_hurd.in: Likewise.
2009-08-08 17:59:19 +00:00
fzielcke
a78c8d240b
2009-08-08 Felix Zielcke <fzielcke@z-51.de>
...
* util/grub-mkconfig.in: Allow the user to specify the used font
with GRUB_FONT.
2009-08-08 06:41:54 +00:00
proski
2f5cb8278a
2009-08-08 Pavel Roskin <proski@gnu.org>
...
* util/grub-mkconfig_lib.in (version_test_numeric): Don't use
the "g" modifier in sed when the intention is to strip something
once. This fixes comparison of kernels with multiple dashes.
2009-08-08 05:37:49 +00:00
proski
29a6b9e8fa
2009-08-08 Pavel Roskin <proski@gnu.org>
...
* util/grub-mkconfig.in: Define datarootdir, datadir may depend
on it. Add missing space before closing bracket. Fix
misleading formatting.
2009-08-08 04:28:12 +00:00
fzielcke
998b5aa9ae
2009-08-07 Felix Zielcke <fzielcke@z-51.de>
...
* util/grub-mkconfig.in: Remove a wrong `fi'.
2009-08-07 14:06:24 +00:00
fzielcke
b969c52f6b
2009-08-07 Felix Zielcke <fzielcke@z-51.de>
...
* util/grub-mkconfig_lib.in (font_path): Move the functionality
of it to ...
* util/grub-mkconfig.in: ... here. Prefer unicode.pf2 and
unifont.pf2 over ascii.pf2. Export LANG=C in case ascii.pf2 gets used.
2009-08-07 12:18:03 +00:00
robertmh
9d5bdd2cf6
Split in two commits. This one's the second.
...
2009-08-07 Robert Millan <rmh.grub@aybabtu.com>
* util/grub.d/10_linux.in (test_numeric): Moved from here ...
* util/grub-mkconfig_lib.in (version_test_numeric): ... to here.
Update all users.
* util/grub.d/10_linux.in (test_gt): Strip any basename prefix,
not just "vmlinu[zx]".
Moved from here ...
* util/grub-mkconfig_lib.in (version_test_gt): ... to here. Update
all users.
* util/grub.d/10_linux.in (find_latest): Moved from here ...
* util/grub-mkconfig_lib.in (version_find_latest): ... to here. Update
all users.
2009-08-07 12:05:06 +00:00
robertmh
7a4894cc99
Split in two commits. This one's the first.
...
2009-08-07 Robert Millan <rmh.grub@aybabtu.com>
* util/grub.d/10_linux.in (test_numeric): Moved from here ...
* util/grub-mkconfig_lib.in (version_test_numeric): ... to here.
Update all users.
* util/grub.d/10_linux.in (test_gt): Strip any basename prefix,
not just "vmlinu[zx]".
Moved from here ...
* util/grub-mkconfig_lib.in (version_test_gt): ... to here. Update
all users.
* util/grub.d/10_linux.in (find_latest): Moved from here ...
* util/grub-mkconfig_lib.in (version_find_latest): ... to here. Update
all users.
2009-08-07 12:02:54 +00:00
robertmh
4e2171f866
2009-08-07 Robert Millan <rmh.grub@aybabtu.com>
...
* util/grub.d/10_freebsd.in: Use an absolute device path for
`vfs.root.mountfrom'. Set `vfs.root.mountfrom.options=rw'.
2009-08-07 11:55:36 +00:00
fzielcke
6dcfcb3291
2009-08-06 Felix Zielcke <fzielcke@z-51.de>
...
* util/grub-mkconfig_lib.in (prepare_grub_to_access_device): Fix
handling of multiple abstraction modules.
2009-08-06 07:05:48 +00:00
phcoder
e768b77068
2009-08-01 14:44:15 +00:00
bean
f45d6cfc48
2009-07-31 Bean <bean123ch@gmail.com>
...
* disk/lvm.c (grub_lvm_scan_device): Ignore extra copy of metadata.
Don't change pv->disk if it's already set.
* disk/raid.c (grub_raid_scan_device): Merge this function into ...
(grub_raid_register): ... here.
(grub_raid_rescan): Removed.
* include/grub/raid.h (grub_raid_rescan): Removed.
* util/grub-fstest.c: Remove include file <grub/raid.h>.
(fstest): Replace grub_raid_rescan with module fini function followed
by init function.
* util/grub-probe.c: Add include file <grub/raid.h>.
(probe_raid_level): New function.
(probe): Detect abstraction by walking the disk device, support two
level of abstraction (LVM on RAID) when detecting partition map.
2009-07-31 14:25:19 +00:00
phcoder
a275d9e7c0
2009-07-30 Vladimir Serbinenko <phcoder@gmail.com>
...
* util/i386/pc/grub-setup.c (setup): Check that no partition is in
embeding zone, not only the first one.
2009-07-29 22:50:38 +00:00
fzielcke
67bb323a1c
2009-07-29 Felix Zielcke <fzielcke@z-51.de>
...
* util/deviceiter.c (get_acceleraid_disk_name): New static
function.
(grub_util_iterate_devices): Handle Accelraid devices.
* util/hostdisk.c (convert_system_partition_to_system_disk): Likewise.
2009-07-29 14:11:50 +00:00
fzielcke
2ddd36d7a9
2009-07-28 Felix Zielcke <fzielcke@z-51.de>
...
* util/i386/pc/grub-install: Fix parsing of --disk-module
option.
2009-07-28 18:32:28 +00:00
fzielcke
c521b62b6c
2009-07-28 Felix Zielcke <fzielcke@z-51.de>
...
* util/i386/pc/grub-setup.c (setup): Fix 2 incorrect checks
when embedding.
2009-07-28 15:58:40 +00:00
fzielcke
880e0a0c70
2009-07-26 Felix Zielcke <fzielcke@z-51.de>
...
* util/grub-mkconfig.in (package_version): New variable.
Use it do display the version.
2009-07-26 11:03:57 +00:00
phcoder
fcaa8b2177
2009-07-24 Vladimir Serbinenko <phcoder@gmail.com>
...
* util/i386/pc/grub-setup.c (setup): Fix bug when
installing on partionless disk.
2009-07-24 20:41:31 +00:00
fzielcke
6a6cbcaf5e
2009-07-21 Felix Zielcke <fzielcke@z-51.de>
...
* util/grub.d/30_os-prober.in: Remove unused CHAINROOT. Don't
add drivemap for Vista. It breaks Windows 7.
2009-07-21 13:37:43 +00:00
proski
4f253044ec
2009-07-19 Yves BLUSSEAU <yves.grub-devel@zetam.org>
...
* util/getroot.c (find_root_device): Add support for MacOSX.
* util/hostdisk.c: Likewise.
2009-07-20 20:03:18 +00:00
proski
5680109e00
2009-07-19 Pavel Roskin <proski@gnu.org>
...
* Makefile.in: Remove LIBLZO and enable_lzo.
* conf/i386-pc.rmk: Remove lzo support.
* configure.ac: Remove checks for lzo, don't define ENABLE_LZMA.
* include/grub/i386/pc/kernel.h: Define ENABLE_LZMA. Remove lzo
support.
* kern/i386/pc/lzo1x.S: Remove.
* kern/i386/pc/startup.S: Remove lzo support.
* util/i386/pc/grub-mkimage.c: Likewise.
2009-07-19 20:23:33 +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
phcoder
ee293aee1b
2009-07-16 Vladimir Serbinenko <phcoder@gmail.com>
...
Fix hang and segmentation fault in grub-emu-usb
* disk/scsi.c (grub_scsi_open): return err and not grub_errno
* util/usb.c (grub_libusb_devices): likewise
(grub_libusb_init): rename to ...
(GRUB_MOD_INIT (libusb)):...this
(grub_libusb_fini): rename to ..
(GRUB_MOD_FINI (libusb)):...this
* disk/usbms.c (grub_usbms_transfer): fix retry logic
* include/grub/disk.h (grub_raid_init): removed, it's useless
(grub_raid_fini): likewise
(grub_lvm_init): likewise
(grub_lvm_fini): likewise
* util/grub-emu.c (main): don't call grub_libusb_init, it's done
by grub_init_all
2009-07-16 15:36:43 +00:00
proski
25f9a05a03
2009-07-07 Pavel Roskin <proski@gnu.org>
...
* include/grub/util/console.h: New file.
* util/console.c: Use it instead of grub/machine/console.h.
* util/grub-emu.c: Likewise.
2009-07-07 20:03:03 +00:00
proski
46eeb6a264
2009-07-05 Pavel Roskin <proski@gnu.org>
...
* util/grub.d/10_freebsd.in: Fix spelling of `device.hints' on
FreeBSD.
* util/osdetect.lua: Likewise.
2009-07-05 22:51:05 +00:00
bean
b4a1dc7990
2009-07-05 Bean <bean123ch@gmail.com>
...
* conf/common.rmk (lua_mode_SOURCES): Add script/lua/lstrlib.c.
* script/lua/grub_lib.c (grub_lua_run): Check input parameter.
(grub_lua_getenv): Likewise.
(grub_lua_setenv): Likewise.
(save_errno): New function.
(push_result): Likewise.
(grub_lua_enum_device): Likewise.
(grub_lua_enum_file): Likewise.
(grub_lua_file_open): Likewise.
(grub_lua_file_close): Likewise.
(grub_lua_file_seek): Likewise.
(grub_lua_file_read): Likewise.
(grub_lua_file_getline): Likewise.
(grub_lua_file_getsize): Likewise.
(grub_lua_file_getpos): Likewise.
(grub_lua_file_eof): Likewise.
(grub_lua_file_exist): Likewise.
(grub_lua_add_menu): Likewise.
* script/lua/grub_lua.h (isupper): New inline function.
(islower): Likewise.
(ispunct): Likewise.
(isxdigit): Likewise.
(strcspn): Change to normal function.
(strpbkr): New function declaration.
(memchr): Likewise.
* script/lua/grub_main.c (scan_str): New function.
(strcspn): Likewise.
(strpbrk): Likewise.
(memchr): Likewise.
* script/lua/linit.c (lualibs): Enable the string library.
* util/osdetect.lua: New file.
2009-07-05 09:59:27 +00:00
proski
d23af54ef4
2009-07-01 Pavel Roskin <proski@gnu.org>
...
* util/hostdisk.c (open_device): Remove `const' from
`sysctl_size', as sysctlbyname() can change it (in this case it
doesn't actually happen).
2009-07-01 23:58:30 +00:00
proski
c6cd3ef022
2009-07-01 Pavel Roskin <proski@gnu.org>
...
* util/hostdisk.c (grub_util_biosdisk_get_grub_dev): Make `p'
constant to avoid a warning on FreeBSD.
2009-07-01 23:07:17 +00:00
proski
0df634200a
2009-07-01 Pavel Roskin <proski@gnu.org>
...
* util/hostdisk.c (device_is_wholedisk): Compile only on systems
where it's needed.
2009-07-01 22:56:51 +00:00
proski
1b96e95249
2009-07-01 Pavel Roskin <proski@gnu.org>
...
* util/misc.c: Move grub_reboot() and grub_halt() ...
* util/grub-emu.c: ... here. Make main_env static.
* include/grub/util/misc.h: Remove main_env.
2009-07-01 15:59:05 +00:00
robertmh
211d06b54b
2009-07-01 Robert Millan <rmh.grub@aybabtu.com>
...
* util/misc.c: Include `<setjmp.h>' and `<grub/machine/machine.h>'.
(grub_reboot, grub_halt): New functions.
* util/i386/pc/misc.c: Delete. Update all users.
* util/sparc64/ieee1275/misc.c: Likewise.
* util/powerpc/ieee1275/misc.c: Likewise.
2009-07-01 13:01:33 +00:00
proski
18b6c557fd
2009-06-28 Pavel Roskin <proski@gnu.org>
...
* util/grub.d/10_linux.in: Match SUSE style initrd names.
2009-06-29 02:59:53 +00:00
robertmh
8231fb77c6
2009-06-27 Pavel Roskin <proski@gnu.org>
...
2009-06-27 Robert Millan <rmh.grub@aybabtu.com>
* include/grub/dl.h: Include grub/elf.h.
(struct grub_dl): Add symtab field.
* kern/dl.c [GRUB_MACHINE_QEMU]: Define
GRUB_MODULES_MACHINE_READONLY.
(grub_dl_resolve_symbols): Populate mod->symtab, making a copy
of the header for read-only modules.
(grub_dl_unload): Free mod->symtab for read-only modules.
* kern/i386/dl.c: Use mod->symtab.
* kern/powerpc/dl.c: Likewise.
* kern/sparc64/dl.c: Likewise.
* kern/x86_64/dl.c: Likewise.
* conf/i386-qemu.rmk: New file.
* kern/i386/qemu/startup.S: Likewise.
* kern/i386/qemu/mmap.c: Likewise.
* boot/i386/qemu/boot.S: Likewise.
* include/grub/i386/qemu/time.h: Likewise.
* include/grub/i386/qemu/serial.h: Likewise.
* include/grub/i386/qemu/kernel.h: Likewise.
* include/grub/i386/qemu/console.h: Likewise.
* include/grub/i386/qemu/boot.h: Likewise.
* include/grub/i386/qemu/init.h: Likewise.
* include/grub/i386/qemu/machine.h: Likewise.
* include/grub/i386/qemu/loader.h: Likewise.
* include/grub/i386/qemu/memory.h: Likewise.
* conf/i386-coreboot.rmk (GRUB_BOOT_MACHINE_LINK_ADDR)
(GRUB_KERNEL_MACHINE_LINK_ADDR): New variables.
[qemu] (pkglib_IMAGES): Add `boot.img'.
[qemu] (boot_img_SOURCES, boot_img_ASFLAGS, boot_img_LDFLAGS)
[qemu] (boot_img_FORMAT): New variables.
[qemu] (bin_UTILITIES): Add `grub-mkimage'.
[qemu] (grub_mkimage_SOURCES, grub_mkimage_CFLAGS): New variables.
[qemu] (kernel_img_SOURCES, kernel_img_HEADERS, kernel_img_CFLAGS)
[qemu] (kernel_img_ASFLAGS, kernel_img_LDFLAGS)
[qemu] (kernel_img_FORMAT): New variables.
* configure.ac: Recognise `i386-qemu'.
* util/i386/pc/grub-mkimage.c (compress_kernel): Add dummy variant
(for no compression).
[GRUB_MACHINE_QEMU] (generate_image): Misc adjustments to produce
a valid i386 ROM image. Make `GRUB_KERNEL_MACHINE_COMPRESSED_SIZE',
`GRUB_KERNEL_MACHINE_INSTALL_DOS_PART' and
`GRUB_KERNEL_MACHINE_INSTALL_BSD_PART' optional features (with
ifdefs).
2009-06-27 11:18:10 +00:00
proski
c402ab1734
2009-06-26 Pavel Roskin <proski@gnu.org>
...
* include/grub/types.h: Define GRUB_TARGET_WORDSIZE.
* include/grub/elf.h: Define symbols without "32" or "64" based
on GRUB_TARGET_WORDSIZE.
* include/grub/multiboot2.h: Use GRUB_TARGET_WORDSIZE.
* efiemu/loadcore32.c: Redefine GRUB_TARGET_WORDSIZE, remove own
ELF definitions.
* efiemu/loadcore64.c: Likewise.
* loader/i386/bsd32.c: Likewise.
* loader/i386/bsd64.c: Likewise.
* kern/dl.c: Remove own ELF definitions.
* util/i386/efi/grub-mkimage.c: Likewise.
2009-06-27 03:01:42 +00:00
robertmh
132a0a595f
2009-06-22 Robert Millan <rmh.grub@aybabtu.com>
...
* conf/i386-pc.rmk (GRUB_MEMORY_MACHINE_LINK_ADDR): Rename to ...
(GRUB_KERNEL_MACHINE_LINK_ADDR): ... this. Update all users.
2009-06-22 19:23:22 +00:00
robertmh
bf3372349c
2009-06-22 Robert Millan <rmh.grub@aybabtu.com>
...
* conf/i386-ieee1275.rmk (pkglib_PROGRAMS): Replace `kernel.elf'
with `kernel.img'.
(kernel_elf_SOURCES): Rename to ...
(kernel_img_SOURCES): ... this.
(kernel_elf_HEADERS): Rename to ...
(kernel_img_HEADERS): ... this. Update all users.
(kernel_elf_ASFLAGS): Rename to ...
(kernel_img_ASFLAGS): ... this.
(kernel_elf_CFLAGS): Rename to ...
(kernel_img_CFLAGS): ... this.
(kernel_elf_LDFLAGS): Rename to ...
(kernel_img_LDFLAGS): ... this.
* conf/i386-coreboot.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* util/elf/grub-mkimage.c (add_segments): Replace "kernel.elf"
with "kernel.img".
2009-06-22 10:27:26 +00:00
robertmh
0db15301d1
2009-06-21 Colin Watson <cjwatson@ubuntu.com>
...
* util/grub-mkconfig.in (GRUB_DISABLE_LINUX_RECOVERY): Export
variable.
* util/grub.d/10_linux.in: If GRUB_DISABLE_LINUX_RECOVERY is true,
don't write a menu entry for recovery mode.
2009-06-21 11:21:59 +00:00
robertmh
546796c1d7
2009-06-20 Robert Millan <rmh.grub@aybabtu.com>
...
* util/i386/pc/grub-mkimage.c (main): Oops, free `output' only
after it's no longer needed.
2009-06-20 14:32:53 +00:00
robertmh
cd7310d5d5
2009-06-20 Robert Millan <rmh.grub@aybabtu.com>
...
* include/grub/i386/loader.h (grub_linux_prot_size)
(grub_linux_tmp_addr, grub_linux_real_addr)
(grub_linux_is_bzimage, grub_linux16_boot): Declare only on
GRUB_MACHINE_PCBIOS.
* util/i386/pc/grub-mkimage.c (compress_kernel): Move
common grub_util_info() call to ...
(generate_image): ... here.
Fix use of uninitialized memory, comparison of signed with
unsigned integers and memory leak.
Remove bogus module address message.
2009-06-20 14:11:45 +00:00
fzielcke
1bd265f306
2009-06-17 Colin Watson <cjwatson@ubuntu.com>
...
* util/elf/grub-mkimage.c (usage): Prefix each option line with two
spaces, for the benefit of help2man.
* util/i386/efi/grub-mkimage.c (usage): Likewise.
2009-06-17 06:07:36 +00:00
fzielcke
b97bcb1953
2009-06-16 Felix Zielcke <fzielcke@z-51.de>
...
* util/grub.d/30_os-prober.in: Use ${root} in the generated
drivemap menuentry.
2009-06-16 16:59:32 +00:00
proski
3ef17a2ebf
2009-06-16 Pavel Roskin <proski@gnu.org>
...
* boot/i386/pc/boot.S: Remove root_drive. Assert offset of
boot_drive_check by using GRUB_BOOT_MACHINE_DRIVE_CHECK. Don't
save %dx, we only need %dl and we never change it.
* boot/i386/pc/cdboot.S: Don't set the root drive.
* boot/i386/pc/pxeboot.S: Likewise.
* include/grub/i386/pc/boot.h: Remove
GRUB_BOOT_MACHINE_ROOT_DRIVE, adjust
GRUB_BOOT_MACHINE_DRIVE_CHECK.
* include/grub/i386/pc/kernel.h: Remove grub_root_drive.
* kern/i386/pc/init.c (make_install_device): Remove references
to grub_root_drive.
* kern/i386/pc/startup.S: Likewise.
* util/i386/pc/grub-setup.c (setup): Don't set root_drive.
2009-06-15 23:25:38 +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
fzielcke
880fc3c4f0
2009-06-13 Jun Inoue <jun.lambda@gmail.com>
...
* util/grub-mkconfig.in: Fix parsing of --output option.
2009-06-13 09:23:54 +00:00
fzielcke
25ad23236f
2009-06-11 Felix Zielcke <fzielcke@z-51.de>
...
* util/grub.d/30_os-prober.in: Fix a comment. Source
${libdir}/grub/grub-mkconfig_lib. Use prepare_grub_to_access_device
to set the root device. Place drivemap command in the generated
chain entry.
2009-06-11 19:00:49 +00:00
proski
bd47b0b5c7
2009-06-11 Colin Watson <cjwatson@ubuntu.com>
...
* util/grub.d/10_linux.in: Capitalise "Linux".
2009-06-11 17:06:35 +00:00
proski
f285fe2d53
2009-06-11 Colin Watson <cjwatson@ubuntu.com>
...
* util/grub-pe2elf.c (usage): Fix references to grub-editenv.
2009-06-11 17:02:26 +00:00
fzielcke
b39f9d20a9
remove all trailing whitespace
2009-06-10 21:04:23 +00:00
robertmh
87b8f28cc1
2009-06-09 Robert Millan <rmh.grub@aybabtu.com>
...
* util/deviceiter.c (grub_util_iterate_devices): Increase number of
disk limit to 26 for IDE, Virtio, Xen and SCSI.
2009-06-09 14:42:37 +00:00
fzielcke
8ec4a6d0e0
2009-06-09 Felix Zielcke <fzielcke@z-51.de>
...
* util/i386/pc/grub-install.in: Change the error message if UUIDs
aren't avaible if ata.mod gets used.
2009-06-09 13:22:31 +00:00
fzielcke
255a27d434
2009-06-08 Felix Zielcke <fzielcke@z-51.de>
...
* util/i386/pc/grub-install.in: Add a parameter --disk-module
to choose between ata and biosdisk module on i386-pc.
2009-06-08 20:51:16 +00:00
phcoder
4c9ec6b3fc
2009-06-08 Vladimir Serbinenko <phcoder@gmail.com>
...
Bugfix: install on partitionless device
* util/hostdisk.c (grub_util_biosdisk_get_grub_dev): check if os_dev
is a whole disk
2009-06-08 13:04:02 +00:00
phcoder
e37ffc5cf6
2009-06-04 Vladimir Serbinenko <phcoder@gmail.com>
...
Use grub-macho2img when compiling with Apple's CC for PCBIOS machine
* conf/common.rmk (bin_UTILITIES): add (on false on condition)
grub-macho2img
(CLEANFILES): add grub-macho2img
(grub_macho2img_SOURCES): new variable
* kern/i386/pc/startup.S (bss_start): new variable
(bss_end): likewise
* genmk.rb: use grub-macho2img for *.img when compiled with Apple's CC
* util/grub-macho2img.c: new file
2009-06-04 21:01:11 +00:00
phcoder
fd2bf2e388
2009-06-04 Vladimir Serbinenko <phcoder@gmail.com>
...
Fix wrong assumptions with grub-mkimage on EFI
* i386/efi/grub-mkimage.c (read_kernel_module): don't write prefox here
(relocate_addresses): consider both r_addend and value at offset
(make_mods_section): zerofill modinfo and header
(convert_elf): write prefix here
2009-06-04 19:32:46 +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
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
fzielcke
f6fd460a40
2009-06-03 Felix Zielcke <fzielcke@z-51.de>
...
* util/grub-mkconfig.in (update_grub_dir): Rename to grub_mkconfig_dir.
2009-06-03 13:53:10 +00:00
proski
cd0d5e3040
2009-05-26 Pavel Roskin <proski@gnu.org>
...
* util/getroot.c (grub_util_get_dev_abstraction): Mark os_dev as
possibly unused.
2009-05-26 20:47:00 +00:00
fzielcke
59e5d3ec80
2009-05-16 Felix Zielcke <fzielcke@z-51.de>
...
* util/grub-mkconfig.in: Export GRUB_TERMINAL_INPUT.
2009-05-16 13:58:07 +00:00
bean
5e898c9d71
2009-05-16 Bean <bean123ch@gmail.com>
...
* include/grub/kernel.h (grub_module_header_types): Add type
OBJ_TYPE_CONFIG.
* kern/main.c (grub_load_config): New function.
(grub_main): Call grub_load_config to read boot config.
* grub-mkimage (generate_image): New parameter config_path.
(options): New option --config.
(main): Parse --config option, and pass it to generate_image.
2009-05-16 12:12:12 +00:00
proski
6f6a8b2869
2009-05-13 Pavel Roskin <proski@gnu.org>
...
* util/i386/pc/grub-setup.c (setup): Remove unused variable
embedding_area_exists.
2009-05-13 21:28:25 +00:00
robertmh
59978c8ae7
2009-05-13 Robert Millan <rmh.grub@aybabtu.com>
...
Improve warning messages for cases where there's no embedding area,
or when it is too small (or core.img too large).
2009-05-13 21:13:11 +00:00
robertmh
667712d716
fix indentation for previous commit
2009-05-13 21:01:26 +00:00
robertmh
15fbf4c442
2009-05-13 Robert Millan <rmh.grub@aybabtu.com>
...
* util/i386/pc/grub-setup.c (setup): Restructure code flow to make
it easier to understand / work with.
2009-05-13 20:59:45 +00:00