Commit b7000adef17a5cce85636e40fa2c2d9851a89e28
1 parent
a6ddeee32d
Exists in
master
and in
16 other branches
Don't set the INITRD_COMPRESS environment variable automatically
Commit 1bf49dd4be0b ("./Makefile: export initial ramdisk compression config option") started setting the INITRD_COMPRESS environment variable depending on which decompression models the kernel had available. That is completely broken. For example, we by default have CONFIG_RD_LZ4 enabled, and are able to decompress such an initrd, but the user tools to *create* such an initrd may not be availble. So trying to tell dracut to generate an lz4-compressed image just because we can decode such an image is completely inappropriate. Cc: J P <ppandit@redhat.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Jan Beulich <JBeulich@suse.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 1 changed file with 3 additions and 1 deletions Side-by-side Diff
Makefile
... | ... | @@ -738,7 +738,9 @@ |
738 | 738 | INITRD_COMPRESS-$(CONFIG_RD_XZ) := xz |
739 | 739 | INITRD_COMPRESS-$(CONFIG_RD_LZO) := lzo |
740 | 740 | INITRD_COMPRESS-$(CONFIG_RD_LZ4) := lz4 |
741 | -export INITRD_COMPRESS := $(INITRD_COMPRESS-y) | |
741 | +# do not export INITRD_COMPRESS, since we didn't actually | |
742 | +# choose a sane default compression above. | |
743 | +# export INITRD_COMPRESS := $(INITRD_COMPRESS-y) | |
742 | 744 | |
743 | 745 | ifdef CONFIG_MODULE_SIG_ALL |
744 | 746 | MODSECKEY = ./signing_key.priv |