From 58be0ce01cace09534179608ac55cebfa1347821 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 9 Feb 2012 12:21:01 +0100 Subject: [PATCH] update to latest git --- 0003-lsinitrd-silence-xz-test.patch | 22 ++++++++++++++++++++++ dracut.spec | 6 +++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 0003-lsinitrd-silence-xz-test.patch diff --git a/0003-lsinitrd-silence-xz-test.patch b/0003-lsinitrd-silence-xz-test.patch new file mode 100644 index 0000000..9e798ab --- /dev/null +++ b/0003-lsinitrd-silence-xz-test.patch @@ -0,0 +1,22 @@ +From d20d307d697811f28fbd74111238c43740697226 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Thu, 9 Feb 2012 11:36:21 +0100 +Subject: [PATCH] lsinitrd: silence xz test + +--- + lsinitrd | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/lsinitrd b/lsinitrd +index 1d953b7..11e5c7a 100755 +--- a/lsinitrd ++++ b/lsinitrd +@@ -36,7 +36,7 @@ image="${1:-/boot/initramfs-$(uname -r).img}" + CAT=zcat + FILE_T=$(file "$image") + +-if echo "test"|xz|xz -dc --single-stream; then ++if echo "test"|xz|xz -dc --single-stream >/dev/null 2>&1; then + XZ_SINGLE_STREAM="--single-stream" + fi + diff --git a/dracut.spec b/dracut.spec index c9d5a1a..5e720d5 100644 --- a/dracut.spec +++ b/dracut.spec @@ -10,7 +10,7 @@ Name: dracut Version: 015 -Release: 3.git20120208%{?dist} +Release: 4.git20120209%{?dist} Summary: Initramfs generator using udev %if 0%{?fedora} || 0%{?rhel} > 6 @@ -26,6 +26,7 @@ URL: https://dracut.wiki.kernel.org/ Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar.bz2 Patch1: 0001-dracut-setup-clean-PATH-w-o-existing-one.patch Patch2: 0002-TEST-15-BTRFSRAID-write-diskimage-to-tmp-dir.patch +Patch3: 0003-lsinitrd-silence-xz-test.patch BuildArch: noarch @@ -309,6 +310,9 @@ rm -rf $RPM_BUILD_ROOT %dir /var/lib/dracut/overlay %changelog +* Thu Feb 09 2012 Harald Hoyer 015-4.git20120209 +- update to latest git + * Wed Feb 08 2012 Harald Hoyer 015-3.git20120208 - update to latest git