Vladimir Serbinenko
96fa2d9d02
Merge branch 'master' into leiflindholm/arm64
2013-11-18 17:51:28 +01:00
Colin Watson
a1f00cc557
* util/grub-mkrescue.c (main): Fix typo.
2013-11-18 15:30:47 +00:00
Vladimir Serbinenko
b40ce65180
* util/grub-install-common.c (grub_install_copy_files): Fix module
...
destination directory.
2013-11-18 15:59:55 +01:00
Vladimir Serbinenko
96adefdb12
* util/grub-mkrescue.c (main): Fix a typo to make yeeloong part
...
work again.
2013-11-18 14:36:31 +01:00
Vladimir Serbinenko
a284320e1e
Fix handling of install lists.
2013-11-18 11:38:00 +01:00
Vladimir Serbinenko
4336b5d85e
* util/grub-mkrescue.c (make_image_fwdisk_abs): Insert all partmap
...
modules to be in line with make_image_abs.
2013-11-18 02:03:36 +01:00
Vladimir Serbinenko
6aa6077bcc
* util/grub-mkrescue.c (main): Add trailing \n in
...
.disk_label.contentDetails to be in line with previous shell script.
2013-11-17 02:05:45 +01:00
Vladimir Serbinenko
66c00cb159
* util/grub-mkrescue.c (main): Use right source file for bootinfo.txt.
2013-11-17 02:03:03 +01:00
Vladimir Serbinenko
3a129dba59
* util/grub-install-common.c (grub_install_parse): Recognize
...
--compress=none like shell script did.
2013-11-17 02:01:21 +01:00
Vladimir Serbinenko
d4d55b29e0
* util/grub-install-common.c (platforms): Fix the order of entries and
...
remove useless field val.
2013-11-17 00:54:40 +01:00
Vladimir Serbinenko
55e2c84fe3
* util/grub-install.c: Add new option --no-bootsector to skip
...
installing of bootsector. Accept --grub-setup=/bin/true as
backwards-compatible synonym.
2013-11-16 21:11:01 +01:00
Leif Lindholm
15a463d742
ARM 64 port by Leif Lindholm
2013-11-16 20:52:55 +01:00
Vladimir Serbinenko
cd46aa6cef
Rewrite grub-install, grub-mkrescue, grub-mkstandalone and grub-mknetdir
...
the function of these files exceeds what can be sanely handled in shell
in posix-comaptible way. Also writing it in C extends the functionality
to non-UNIX-like OS and minimal environments.
2013-11-16 20:21:16 +01:00
Colin Watson
23012db921
* util/grub-reboot.in (usage): Fix a typo.
2013-11-15 14:32:03 +00:00
Colin Watson
0de172a0c0
* util/grub-install_header: Set localedir here, since this file is
...
where it's used.
* util/grub-install.in: Remove setting of localedir.
* util/grub-mkrescue.in: Likewise.
2013-11-14 16:45:27 +00:00
Colin Watson
1326b9ae2a
* util/getroot.c (grub_util_biosdisk_get_grub_dev) [__GNU__]: Remove
...
unused variables.
2013-11-14 15:08:37 +00:00
Colin Watson
11b2a9b70b
* util/grub-install.in (efi_quiet): Fix inverted logic: make
...
efibootmgr quiet when --debug is not used, rather than when it is.
2013-11-13 13:05:39 +00:00
Colin Watson
d0d1e3dacb
* util/grub-editenv.c (help_filter, argp): Document how to delete
...
the whole environment block.
Reported by Dan Jacobson. Fixes Debian bug #726265 .
2013-11-13 02:15:57 +00:00
Lukas Schwaighofer
2d357558fb
* util/grub.d/20_linux_xen.in: Don't decompress initrd.
2013-11-12 21:03:27 +01:00
Vladimir Serbinenko
66acd9d64c
* util/getroot.c (grub_util_biosdisk_get_grub_dev) [__APPLE__]:
...
Add missing semicolon.
2013-11-11 22:49:52 +01:00
Vladimir Serbinenko
348d05359c
* util/grub-macho2img.c: Use plain fopen rather than grub_util_fopen.
2013-11-11 22:48:43 +01:00
Vladimir Serbinenko
0d2d30bb39
* configure.ac: Check for lzma.h for enabling liblzma and allow
...
manual disabling.
2013-11-11 22:47:48 +01:00
Fam Zheng
e756ec8284
* util/grub.d/30_os-prober.in: Add minix entry.
2013-11-11 00:24:49 +01:00
Vladimir Serbinenko
881c6a1049
* util/grub-mkimagexx.c (generate_elf): Fix module address on coreboot.
2013-11-10 19:34:19 +01:00
Vladimir Serbinenko
9612ebc00e
Add new ports: i386-xen and x86_64-xen. This allows running GRUB in
...
XEN PV environment and load kernels.
2013-11-09 21:29:11 +01:00
Vladimir Serbinenko
d1307d873a
Import libgcrypt 1.5.3.
2013-11-07 06:35:50 +01:00
Vladimir Serbinenko
ec0ebb3fc2
Remove vestiges of -Wunsafe-loop-optimisations.
...
* conf/Makefile.common (CFLAGS_GNULIB): Remove
-Wno-unsafe-loop-optimisations.
* grub-core/commands/legacycfg.c: Remove -Wunsafe-loop-optimisations
pragma.
* grub-core/io/gzio.c: Likewise.
* grub-core/script/parser.y: Likewise.
* grub-core/script/yylex.l: Likewise.
* util/grub-mkfont.c: Likewise.
2013-11-07 02:25:31 +01:00
Vladimir Serbinenko
6ab537e324
* util/grub-mkfont.c (process_cursive): Remove nested function.
2013-11-07 02:13:30 +01:00
Vladimir Serbinenko
7cb24eb5ff
* util/grub-mkimagexx.c (relocate_symbols): Remove unneeded brackets.
2013-11-07 01:04:06 +01:00
Vladimir Serbinenko
5701750c2c
* util/mkimage.c (SzAlloc): Use attribute unused rather than dubious
...
assigning to itself.
2013-11-07 00:30:41 +01:00
Vladimir Serbinenko
323de05ba2
Support GRUB_DISABLE_SUBMENU config.
...
Inspired by patch from Prarit Bhargava.
2013-11-04 00:15:31 +01:00
Vladimir Serbinenko
bed78ef4e6
Revert "Attempts at ZFS options"
...
It was accidently committed to wrong branch
This reverts commit 0ee5cdfe9f
.
2013-11-03 16:52:33 +01:00
Vladimir Serbinenko
0ee5cdfe9f
Attempts at ZFS options
2013-11-03 16:40:32 +01:00
Vladimir Serbinenko
fb9f12a02d
* util/grub.d/30_os-prober.in: Add unhiding of partition if on msdos.
2013-11-02 22:00:59 +01:00
Vladimir Serbinenko
4685200fa9
* util/grub-mount.c: Handle symlinks to directories.
2013-11-02 20:30:39 +01:00
Vladimir Serbinenko
a0c9d5c6d9
* util/grub-mkimagexx.c (locate_sections): Reject mislinked images.
2013-11-02 19:16:36 +01:00
Vladimir Serbinenko
cb72aa1809
Rewrite blocklist functions in order to get progress when
...
reading large extents and decrease amount of blocklist hook calls.
2013-11-01 23:28:03 +01:00
Vladimir Serbinenko
9a021c5580
* util/grub-mkrescue.in: Do not use UUID search on EFI.
2013-11-01 16:05:15 +01:00
Vladimir Serbinenko
5177391ebe
* include/grub/emu/hostdisk.h: Add proper declaration for grub_host_init
...
and grub_hostfs_init.
2013-10-28 13:33:12 +01:00
Vladimir Serbinenko
30fd7198fe
* util/grub-mkfont.c (main): Show error message when FT_Set_Pixel_Sizes
...
fails.
2013-10-27 20:38:32 +01:00
Vladimir Serbinenko
cf880639f6
Revert " * util/grub-mkstandalone.in: Remove needless copying since we already"
...
The copying in question was needed.
This reverts commit 8154884dd4
.
2013-10-27 12:22:52 +01:00
Grégoire Sutre
f37bf9c778
* util/grub.d/00_header.in: Don't use LANG if it's not set.
2013-10-26 20:11:55 +02:00
Grégoire Sutre
67811a6fd4
* util/grub-mkconfig.in: Replace $0 with $self.
...
* util/grub-reboot.in: Likewise.
* util/grub-set-default.in: Likewise.
2013-10-26 20:05:29 +02:00
Vladimir 'phcoder' Serbinenko
cd78a56fb2
Move stat () and device mode checking into OS-dependent files as
...
long as performance doesn't suffer.
2013-10-19 16:29:20 +02:00
Vladimir 'phcoder' Serbinenko
663f6eb195
* util/grub-mkimagexx.c (make_reloc_section): Fix memory leak.
...
(load_image): Likewise.
2013-10-19 02:39:06 +02:00
Vladimir 'phcoder' Serbinenko
6f65237374
* util/grub-render-label.c: Move backend part to ...
...
* util/render-label.c: ... here.
2013-10-19 02:37:01 +02:00
Vladimir 'phcoder' Serbinenko
44d1c20a13
* util/grub-render-label.c: Move backend part to ...
...
* util/render-label.c: ... here.
2013-10-19 02:34:18 +02:00
Vladimir 'phcoder' Serbinenko
8154884dd4
* util/grub-mkstandalone.in: Remove needless copying since we already
...
pass the files to tar.
2013-10-17 01:12:22 +02:00
Hiroyuki YAMAMORI
ceca6ddf26
Handle Japanese special keys.
...
Reported by: Hiroyuki YAMAMORI.
Codes supplied by: Hiroyuki YAMAMORI.
2013-10-17 00:49:05 +02:00
Vladimir 'phcoder' Serbinenko
593816780e
* util/editenv.c (grub_util_create_envblk_file): Use grub_util_rename.
2013-10-15 21:25:18 +02:00
Vladimir 'phcoder' Serbinenko
bacfefbb0e
* util/grub-editenv.c (create_envblk_file): More from here ...
...
* util/editenv.c (grub_util_create_envblk_file): ... to here.
2013-10-15 21:23:54 +02:00
Vladimir 'phcoder' Serbinenko
df1e64c98e
Define grub_util_is_directory/regular/special_file and
...
use OS-dependent versions rather than to rely on stat().
2013-10-15 20:27:58 +02:00
Vladimir 'phcoder' Serbinenko
ec16e02639
* util/grub-mkimage.c: Move backend part to ...
...
* util/mkimage.c: ... here.
2013-10-15 19:14:55 +02:00
Vladimir 'phcoder' Serbinenko
f4e0adc0f9
Remove leftover references to some of the system headers.
2013-10-15 17:59:54 +02:00
Vladimir 'phcoder' Serbinenko
5a869940de
Split out blocklist retrieving from setup.c to
...
grub-core/osdep/blocklist.c and add windows implementation since
generic version doesn't work on NTFS on Windows due to aggressive
unflushable cache.
2013-10-15 17:02:26 +02:00
Vladimir 'phcoder' Serbinenko
c06c75201c
Split grub-setup.c into frontend (grub-setup.c) and backend (setup.c)
...
files.
2013-10-15 16:16:04 +02:00
Vladimir 'phcoder' Serbinenko
588744d0dc
* util/grub-probe.c (probe): Separate different drives in hint-str
...
by spaces and not newlines.
* util/grub-mkconfig_lib.in: Handle multidevice filesystem.
2013-10-14 18:27:29 +02:00
Vladimir 'phcoder' Serbinenko
66a1b3eeb7
* util/misc.c (grub_util_get_image_size): Use FILE functions rather than
...
stat.
2013-10-13 23:45:22 +02:00
Vladimir 'phcoder' Serbinenko
e19bec1715
* util/grub-editenv.c: Remove leftover set_program_name and init_nls.
2013-10-13 23:44:07 +02:00
Vladimir 'phcoder' Serbinenko
bb338aaf24
Add a wrapper for fopen. On unix-like systems just pass-through. On
...
windows use unicode version.
2013-10-13 20:36:28 +02:00
Vladimir 'phcoder' Serbinenko
ae5540d3d4
Move set_program_name and init_nls to host_init. On windows
...
fix in this fuction console and argument charset as well.
2013-10-13 20:03:42 +02:00
Andrey Borzenkov
4cd3c4fec7
Fix inconsistent use of GRUB_CRYPTODISK_ENABLE and
...
GRUB_ENABLE_CRYPTODISK.
* util/grub-install.in: Rename all GRUB_CRYPTODISK_ENABLE to
GRUB_ENABLE_CRYPTODISK.
* util/grub-mkconfig_lib.in: Likewise.
2013-10-12 08:17:05 +02:00
Vladimir 'phcoder' Serbinenko
ba9baabecd
* util/grub-setup.c (setup): Move copying of partition table as
...
futher up as possible to avoid possible overwrite by floppy routines.
2013-10-11 16:15:43 +02:00
Vladimir 'phcoder' Serbinenko
3530bc9d90
* util/getroot.c (make_device_name): Remove dos_part and bsd_part as
...
it's mostly unused. Move vestiges to the callers.
2013-10-10 10:21:07 +02:00
Vladimir 'phcoder' Serbinenko
fb9f59c3ce
* util/grub-mkpasswd-pbkdf2.c: Remove temporary buffers for hex
...
version of salt and hash. Use grub_snprintf rather than snprintf.
2013-10-10 10:16:37 +02:00
Vladimir 'phcoder' Serbinenko
71c1d67a34
Avoid including hostfile.h when not necessarry as it pulls
...
in OS-specific headers which may redefine generic names
like "far".
2013-10-10 09:18:06 +02:00
Vladimir 'phcoder' Serbinenko
f7676b7016
* util/grub-mkimage.c (generate_image): Use size_t instead of
...
grub_size_t.
* util/grub-mkimagexx.c (locate_sections): Likewise.
(load_image): Likewise.
2013-10-09 05:36:00 +02:00
Vladimir 'phcoder' Serbinenko
22f98db270
* util/misc.c (grub_util_write_image_at): Don't use PRIxGRUB_SIZE for
...
size_t.
(grub_util_write_image): Likewise.
2013-10-09 05:33:09 +02:00
Vladimir 'phcoder' Serbinenko
acbbe5cbad
* include/grub/util/lvm.h: Removed.
2013-10-08 21:01:09 +02:00
Vladimir 'phcoder' Serbinenko
9a2c903f28
* util/ieee1275/ofpath.c: Move to ...
...
* grub-core/osdep/linux/ofpath.c: ..here, split stub into ...
* grub-core/osdep/basic/ofpath.c: ..here.
2013-10-08 18:25:49 +02:00
Vladimir 'phcoder' Serbinenko
c1ca424476
Move sleep routines to grub-core/osdep.
2013-10-08 17:38:46 +02:00
Vladimir 'phcoder' Serbinenko
672fa55e81
Move OS-dependent files to grub-core/osdep and document it.
2013-10-08 17:30:22 +02:00
Vladimir 'phcoder' Serbinenko
f8772ea7f5
* util/misc.c: Remove leftover inclusion of malloc.h.
2013-10-08 17:02:22 +02:00
Vladimir 'phcoder' Serbinenko
cef86fefda
* util/raid.c: Fold into ...
...
* util/getroot_linux.c: ... here. Make all functions static.
2013-10-08 16:59:50 +02:00
Vladimir 'phcoder' Serbinenko
de300af2ac
* util/random_unix.c: Add NetBSD and Mac OS X to verified list.
2013-10-08 16:35:21 +02:00
Samuel Thibault
1db3830418
* util/grub.d/10_hurd.in: Use version_find_latest
to sort gnumach
...
kernels by version order.
2013-10-06 01:52:24 +02:00
Vladimir 'phcoder' Serbinenko
fb295fc070
* util/random_unix.c: Add kFreeBSD to the list of secure RNG.
2013-10-04 02:39:31 +02:00
Vladimir 'phcoder' Serbinenko
47345010a4
Add AROS hostdisk and getroot routines.
2013-10-04 02:35:03 +02:00
Vladimir 'phcoder' Serbinenko
bf25f87931
Make cryptodisk and diskfilter probe data retrievable programmatically
...
and not just printable.
2013-10-04 01:43:47 +02:00
Vladimir 'phcoder' Serbinenko
24ca45125e
Split random retrieving code into separate files.
2013-10-04 01:29:10 +02:00
Jon McCune
0340bdbc22
* grub-core/commands/loadenv.c: Support skipping signature check
...
and variable names filtering.
2013-09-27 02:08:32 +02:00
Vladimir 'phcoder' Serbinenko
30b7f58f4e
* grub-core/kern/emu/hostdisk_unix.c: Declare AROS as non-unix.
...
* grub-core/kern/emu/hostfs.c: Likewise.
* util/getroot_unix.c: Likewise.
2013-09-24 19:19:31 +02:00
Vladimir 'phcoder' Serbinenko
bab7b1ebeb
* include/grub/emu/hostdisk.h (GRUB_FD_STAT_IS_FUNTIONAL): New define.
...
Migrate all explicit defines to this new one.
2013-09-24 19:17:24 +02:00
Vladimir 'phcoder' Serbinenko
e8fd80bc3d
* util/getroot.c (grub_util_biosdisk_is_present): Don't do stat on
...
platforms on which it doesn't work.
2013-09-24 18:58:33 +02:00
Vladimir 'phcoder' Serbinenko
5177ba1400
* util/getroot.c (grub_util_check_block_device): Move to ...
...
* util/getroot_unix.c (grub_util_check_block_device): ... here.
* util/getroot.c (grub_util_check_char_device): Move to ...
* util/getroot_unix.c (grub_util_check_char_device): ... here.
2013-09-24 18:55:10 +02:00
Paulo Flabiano Smorigo
39cfdaa9a2
* util/grub-install.in: Add GPT PReP support.
...
* util/grub-probe.c (probe): Support GPT partition type.
(main): Support -t gpt_parttype.
2013-09-23 17:42:32 -03:00
Tim Hardeck
9c262ff966
* util/grub.d/10_hurd.in: Filter out character for the class.
...
* util/grub.d/10_kfreebsd.in: Likewise.
* util/grub.d/10_linux.in: Likewise.
* util/grub.d/20_linux_xen.in: Likewise.
2013-09-23 17:48:38 +02:00
Vladimir 'phcoder' Serbinenko
3f7d9c8280
* util/getroot.c (grub_util_biosdisk_get_grub_dev): Do not assume
...
that floppies are unpartitioned.
2013-09-23 12:19:49 +02:00
Vladimir 'phcoder' Serbinenko
bca8873a0c
* util/getroot_unix.c [__MINGW32__ || __CYGWIN__]:
...
Define dummy grub_util_pull_lvm_by_command to decrease number of #if's.
2013-09-23 12:06:00 +02:00
Vladimir 'phcoder' Serbinenko
7e518ca84f
Use Winapi on both cygwin and mingw32 to share more code between both.
2013-09-23 11:21:09 +02:00
Andrey Borzenkov
d68d01573b
* util/grub-install.in: Add --grub-editenv option.
...
* util/grub-install_header (grub_compress_file): Explicitly check for
plain file to avoid cp error.
2013-09-22 21:47:52 +04:00
Andrey Borzenkov
775b284dd6
* docs/grub.texi (Device syntax): Document new LVM UUID based device
...
names; fix LVM driver name (lvm, not lv).
* util/grub-probe.c (probe_abstraction): Support lvmid/xxx device
names.
2013-09-22 21:35:13 +04:00
Vladimir 'phcoder' Serbinenko
3ff4063dd3
* grub-core/kern/emu/hostdisk.c: Disentagle into a series of OS-specific
...
files rather than one file with loads of #if's.
* util/getroot.c: Likewise.
2013-09-22 07:36:17 +02:00
Vladimir 'phcoder' Serbinenko
d1983764f4
* util/grub-mkpasswd-pbkdf2.c (grub_get_random): Add windows and
...
GNU/Hurd to the list of checked PRNG.
2013-09-22 03:28:32 +02:00
Vladimir 'phcoder' Serbinenko
63653cfdae
* grub-core/disk/diskfilter.c: Handle non-md UUIDs.
...
* grub-core/disk/lvm.c: Add LVM UUIDs.
* util/getroot.c: Use LVM UUIDs whenever possible.
2013-09-20 20:37:03 +02:00
Vladimir 'phcoder' Serbinenko
53c6b7d658
* util/getroot.c (grub_util_open_dm): Check major rather than the name
...
to determine if device is handled by devmapper.
(convert_system_partition_to_system_disk): Likewise.
(get_dm_uuid): Don't check explicitly if device is mapped, it's
already done in grub_util_open_dm.
2013-09-19 09:46:06 +02:00
Vladimir 'phcoder' Serbinenko
90379808b6
* util/lvm.c: Remove since unused. Remove remaining references.
2013-09-19 09:05:56 +02:00
Vladimir 'phcoder' Serbinenko
386701a8fe
Handle the case of partitioned LVM properly.
...
* grub-core/kern/emu/hostdisk.c (grub_util_get_dm_node_linear_info):
Stop on meeting LVM, mpath or DMRAID.
(grub_hostdisk_os_dev_to_grub_drive): Canonicalize os device.
(read_device_map): Likewise.
* util/getroot.c (convert_system_partition_to_system_disk): Assume that
device is full disk rather than erroring out on LVM and similar cases.
2013-09-19 08:48:54 +02:00
Vladimir 'phcoder' Serbinenko
5307078763
* util/grub-mkconfig_lib.in: Keep supplied pkgdatadir if any.
2013-09-18 20:26:16 +02:00
Douglas Ray
d404d15450
* util/grub-mkpasswd-pbkdf2.c (grub_get_random): Declare OpenBSD PRNG
...
as secure.
2013-09-18 13:44:00 +02:00