SVN: geninitrd/trunk/geninitrd

[arekm]

Author: arekm
Date: Fri Sep  4 12:58:29 2009
New Revision: 10526

Modified:
   geninitrd/trunk/geninitrd
Log:
Allow xz only and not lzma. -9 for xz is back.

Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Fri Sep  4 12:58:29 2009
@@ -47,7 +47,7 @@
 	uname_r=$(uname -r)
 	echo "usage: $PROGRAM [--version] [-v] [-f] [--ifneeded] [--preload <module>]"
 	echo "       [--with=<module>] [--image-version] [--fstab=<fstab>] [--nocompress]"
-	echo "       [--compress=yes|lzma|bzip2|gzip]"
+	echo "       [--compress=yes|xz|bzip2|gzip]"
 	echo "       [--initrdfs=rom|initramfs|ext2|cram] [--modules-conf=<modules.conf>]"
 	echo "       [--with-bootsplash] [--without-bootsplash]"
 	echo "       [--with-fbsplash] [--without-fbsplash]"
@@ -790,7 +790,7 @@
 find_compressor() {
 	local mode="$1"
 	# the best compressor list
-	local compressors='lzma bzip2 gzip'
+	local compressors='xz bzip2 gzip'
 
 	# a specified one, take it
 	if ! is_yes "$mode"; then
@@ -802,9 +802,9 @@
 	local c prog map=/boot/System.map-$kernel
 	for c in $compressors; do
 		case $c in
-		lzma)
+		xz)
 			sym=unlzma
-			prog=/usr/bin/lzma
+			prog=/usr/bin/xz
 			;;
 		bzip2)
 			sym=bzip2
@@ -1327,8 +1327,8 @@
 	# TODO: the image name (specified from kernel.spec) already contains
 	# extension, which is .gz most of the time.
 	case "$compressor" in
-	lzma)
-		lzma < "$IMAGE" > "$tmp"
+	xz)
+		xz -9 < "$IMAGE" > "$tmp"
 		;;
 	bzip2)
 		bzip2 -9 < "$IMAGE" > "$tmp"