From: Marcin Krol <hawk@tld-linux.org>
Date: Mon, 30 Nov 2015 13:14:12 +0000 (+0000)
Subject: - renamed, now it changes order in which compressors are detected
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=809725e53f690887639ce1571d5d123837d3a7e4;p=packages%2Fdracut.git

- renamed, now it changes order in which compressors are detected
---

diff --git a/xz_compressor.patch b/compressors.patch
similarity index 68%
rename from xz_compressor.patch
rename to compressors.patch
index 2e701c0..2a997b0 100644
--- a/xz_compressor.patch
+++ b/compressors.patch
@@ -1,7 +1,7 @@
-diff -ur dracut-040.orig/dracut.sh dracut-040/dracut.sh
---- dracut-040.orig/dracut.sh	2014-11-21 14:04:57.000000000 +0000
-+++ dracut-040/dracut.sh	2014-11-22 13:19:07.066000000 +0000
-@@ -163,8 +163,6 @@
+diff -ur dracut-044.orig/dracut.sh dracut-044/dracut.sh
+--- dracut-044.orig/dracut.sh	2015-11-30 12:50:20.000000000 +0000
++++ dracut-044/dracut.sh	2015-11-30 12:59:15.110305000 +0000
+@@ -173,8 +173,6 @@
    --install-optional [LIST]  Install the space separated list of files into the
                           initramfs, if they exist.
    --gzip                Compress the generated initramfs using gzip.
@@ -10,7 +10,7 @@ diff -ur dracut-040.orig/dracut.sh dracut-040/dracut.sh
    --bzip2               Compress the generated initramfs using bzip2.
                           Make sure your kernel has bzip2 decompression support
                           compiled in, otherwise you will not be able to boot.
-@@ -172,6 +170,8 @@
+@@ -182,6 +180,8 @@
                           Make sure your kernel has lzma support compiled in,
                           otherwise you will not be able to boot.
    --xz                  Compress the generated initramfs using xz.
@@ -19,12 +19,12 @@ diff -ur dracut-040.orig/dracut.sh dracut-040/dracut.sh
                           Make sure that your kernel has xz support compiled
                           in, otherwise you will not be able to boot.
    --lzo                 Compress the generated initramfs using lzop.
-@@ -817,7 +817,7 @@
- fw_dir=${fw_dir//:/ }
+@@ -769,7 +769,7 @@
  
- # handle compression options.
--[[ $compress ]] || compress="gzip"
-+[[ $compress ]] || compress="xz"
- case $compress in
-     bzip2) compress="bzip2 -9";;
-     lzma)  compress="lzma -9 -T0";;
+ if ! [[ $compress ]]; then
+     # check all known compressors, if none specified
+-    for i in pigz gzip lz4 lzop lzma xz lbzip2 bzip2 cat; do
++    for i in xz lzma bzip2 lbzip2 gzip pigz lz4 lzop cat; do
+         command -v "$i" &>/dev/null || continue
+         compress="$i"
+         break