Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7000ade authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Don't set the INITRD_COMPRESS environment variable automatically 



Commit 1bf49dd4 ("./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: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a6ddeee3

Makefile

+3 −1
Original line number Diff line number Diff line
@@ -738,7 +738,9 @@ INITRD_COMPRESS-$(CONFIG_RD_LZMA) := lzma 
INITRD_COMPRESS-$(CONFIG_RD_XZ)    := xz

INITRD_COMPRESS-$(CONFIG_RD_LZO)   := lzo

INITRD_COMPRESS-$(CONFIG_RD_LZ4)   := lz4

export INITRD_COMPRESS := $(INITRD_COMPRESS-y)

# do not export INITRD_COMPRESS, since we didn't actually

# choose a sane default compression above.

# export INITRD_COMPRESS := $(INITRD_COMPRESS-y)



ifdef CONFIG_MODULE_SIG_ALL

MODSECKEY = ./signing_key.priv