vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* util/grub-mkimage.c (image_targets): Set default_compression to lzma

Browse source 
on i386-pc target.
	(argp_parser): Accept "auto" as compression specification.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-09 14:43:21 +01:00
parent e4e37e8dfa
commit a9d96eeb21
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2012-02-09 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-mkimage.c (image_targets): Set default_compression to lzma
on i386-pc target.
(argp_parser): Accept "auto" as compression specification.
2012-02-09 Vladimir Serbinenko <phcoder@gmail.com> 2012-02-09 Vladimir Serbinenko <phcoder@gmail.com>
Fix `help' with unloaded modules. Fix `help' with unloaded modules.

8
util/grub-mkimage.c
View file

@ -151,7 +151,8 @@ struct image_target_desc image_targets[] =
.decompressor_uncompressed_addr = TARGET_NO_FIELD, .decompressor_uncompressed_addr = TARGET_NO_FIELD,
.section_align = 1, .section_align = 1,
.vaddr_offset = 0, .vaddr_offset = 0,
.link_addr = GRUB_KERNEL_I386_PC_LINK_ADDR .link_addr = GRUB_KERNEL_I386_PC_LINK_ADDR,
.default_compression = COMPRESSION_LZMA
}, },
{ {
.dirname = "i386-pc", .dirname = "i386-pc",
@ -166,7 +167,8 @@ struct image_target_desc image_targets[] =
.decompressor_uncompressed_addr = TARGET_NO_FIELD, .decompressor_uncompressed_addr = TARGET_NO_FIELD,
.section_align = 1, .section_align = 1,
.vaddr_offset = 0, .vaddr_offset = 0,
.link_addr = GRUB_KERNEL_I386_PC_LINK_ADDR .link_addr = GRUB_KERNEL_I386_PC_LINK_ADDR,
.default_compression = COMPRESSION_LZMA
}, },
{ {
.dirname = "i386-efi", .dirname = "i386-efi",
@ -1773,6 +1775,8 @@ argp_parser (int key, char *arg, struct argp_state *state)
} }
else if (grub_strcmp (arg, "none") == 0) else if (grub_strcmp (arg, "none") == 0)
arguments->comp = COMPRESSION_NONE; arguments->comp = COMPRESSION_NONE;
else if (grub_strcmp (arg, "auto") == 0)
arguments->comp = COMPRESSION_AUTO;
else else
grub_util_error (_("Unknown compression format %s"), arg); grub_util_error (_("Unknown compression format %s"), arg);
break; break;