From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Sun, 31 Jan 2016 16:04:15 +0000 (+0100)
Subject: - rel 2; compressors list changed to make best (size) ones as first; always add parti... 
X-Git-Tag: auto/th/geninitrd-12757-2~1
X-Git-Url: https://git.pld-linux.org/?p=packages%2Fgeninitrd.git;a=commitdiff_plain;h=4c88056560d18fdd1db78358bc228cc87d96b6cf

- rel 2; compressors list changed to make best (size) ones as first; always add partitions and containers to initrd mdadm config.
---

diff --git a/geninitrd-git.patch b/geninitrd-git.patch
index e69de29..90d528a 100644
--- a/geninitrd-git.patch
+++ b/geninitrd-git.patch
@@ -0,0 +1,36 @@
+diff --git a/geninitrd b/geninitrd
+index 7b962b5..a4de196 100755
+--- a/geninitrd
++++ b/geninitrd
+@@ -1103,8 +1103,7 @@ sym_exists() {
+ # find best compressor (or forced one) for initrd
+ find_compressor() {
+ 	local mode="$1"
+-	# fastest initrd decompression speed is first
+-	local compressors='lzo gzip xz lzma bzip2'
++	local compressors='xz lzma bzip2 gzip lzo'
+ 
+ 	# a specified one, take it
+ 	if ! is_yes "$mode"; then
+diff --git a/mod-md.sh b/mod-md.sh
+index a0cd7aa..d9093d4 100644
+--- a/mod-md.sh
++++ b/mod-md.sh
+@@ -139,13 +139,15 @@ initrd_gen_md() {
+ 
+ 	inst_exec $mdassemble /bin/mdassemble
+ 
++	echo "DEVICE partitions containers" >> "$DESTDIR/etc/mdadm.conf"
++
+ 	# LVM on RAID case
+ 	local dev_list_extra ex_dev
+ 	dev_list_extra=$(awk '/^DEVICE / { for (i=2; i<=NF; i++) { printf "%s ", $i; }; } ' /etc/mdadm.conf | xargs)
+ 	new_dev_list_extra=""
+ 	for ex_dev in $dev_list_extra; do
+-		if [ "$ex_dev" = "partitions" ]; then
+-			echo "DEVICE partitions" >> "$DESTDIR/etc/mdadm.conf"
++		if [ "$ex_dev" = "partitions" -o "$ex_dev" = "containers" ]; then
++			echo "DEVICE $ex_dev" >> "$DESTDIR/etc/mdadm.conf"
+ 			# FIXME: find and copy partition devices from /proc/partitions
+ 			#        - best if done at runtime, now initrd gen time
+ 			continue
diff --git a/geninitrd.spec b/geninitrd.spec
index 5af4ffd..66eeee6 100644
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -7,7 +7,7 @@ Summary:	Creates an initial ramdisk image for preloading modules
 Summary(pl.UTF-8):	Narzędzie do tworzenia inicjalnego ramdysku używanego przy starcie systemu
 Name:		geninitrd
 Version:	12757
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications/System
 Source0:	%{name}-%{version}.tar.gz