From a9d96eeb21040609d554f74778d2a84e0dbf79c6 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Thu, 9 Feb 2012 14:43:21 +0100 Subject: [PATCH] * util/grub-mkimage.c (image_targets): Set default_compression to lzma on i386-pc target. (argp_parser): Accept "auto" as compression specification. --- ChangeLog | 6 ++++++ util/grub-mkimage.c | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9bf245ef4..4e35d2bd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-02-09 Vladimir Serbinenko + + * 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 Fix `help' with unloaded modules. diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c index b1e2f4c7b..7a57d3f98 100644 --- a/util/grub-mkimage.c +++ b/util/grub-mkimage.c @@ -151,7 +151,8 @@ struct image_target_desc image_targets[] = .decompressor_uncompressed_addr = TARGET_NO_FIELD, .section_align = 1, .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", @@ -166,7 +167,8 @@ struct image_target_desc image_targets[] = .decompressor_uncompressed_addr = TARGET_NO_FIELD, .section_align = 1, .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", @@ -1773,6 +1775,8 @@ argp_parser (int key, char *arg, struct argp_state *state) } else if (grub_strcmp (arg, "none") == 0) arguments->comp = COMPRESSION_NONE; + else if (grub_strcmp (arg, "auto") == 0) + arguments->comp = COMPRESSION_AUTO; else grub_util_error (_("Unknown compression format %s"), arg); break;