[dracut/f18] dracut-024-5.git20121019

[Harald Hoyer]

commit 1b7a0fbd52331d86c0d01bad459ae68f5b5c6c7c
Author: Harald Hoyer <harald at redhat.com>
Date:   Fri Oct 19 11:21:40 2012 +0200

    dracut-024-5.git20121019
    
    - only 'warn' not 'error', if we don't strip the initramfs

 ....sh-only-warn-not-error-if-we-don-t-strip.patch |   22 ++++++++++++++++++++
 dracut.spec                                        |    6 ++++-
 2 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/0004-dracut.sh-only-warn-not-error-if-we-don-t-strip.patch b/0004-dracut.sh-only-warn-not-error-if-we-don-t-strip.patch
new file mode 100644
index 0000000..bc5cb2a
--- /dev/null
+++ b/0004-dracut.sh-only-warn-not-error-if-we-don-t-strip.patch
@@ -0,0 +1,22 @@
+From b26897fb6099ed9ee67ed6e19e751be11d38fcf3 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Fri, 19 Oct 2012 11:20:07 +0200
+Subject: [PATCH] dracut.sh: only 'warn' not 'error', if we don't strip
+
+---
+ dracut.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dracut.sh b/dracut.sh
+index aab850e..e463404 100755
+--- a/dracut.sh
++++ b/dracut.sh
+@@ -1031,7 +1031,7 @@ fi
+ if [[ $do_strip = yes ]] ; then
+     for p in strip xargs find; do
+         if ! type -P $p >/dev/null; then
+-            derror "Could not find '$p'. You should run $0 with '--nostrip'."
++            dwarn "Could not find '$p'. Not stripping the initramfs."
+             do_strip=no
+         fi
+     done
diff --git a/dracut.spec b/dracut.spec
index 611c014..7354cc7 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -10,7 +10,7 @@
 
 Name: dracut
 Version: 024
-Release: 4.git20121019%{?dist}
+Release: 5.git20121019%{?dist}
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora} || 0%{?rhel}
@@ -32,6 +32,7 @@ Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar
 Patch1: 0001-dracut.sh-only-save-kernel_cmdline-if-set.patch
 Patch2: 0002-dracut.conf.d-fedora.conf.example-s-kernelcmdline-ke.patch
 Patch3: 0003-40network-ifup.sh-do_static-and-do_ipv6auto-return-0.patch
+Patch4: 0004-dracut.sh-only-warn-not-error-if-we-don-t-strip.patch
 
 
 BuildRequires: dash bash git
@@ -365,6 +366,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Fri Oct 19 2012 Harald Hoyer <harald at redhat.com> 024-5.git20121019
+- only 'warn' not 'error', if we don't strip the initramfs
+
 * Fri Oct 19 2012 Harald Hoyer <harald at redhat.com> 024-4.git20121019
 - fix ifup exit code
 - fixed default "rd.auto" parameter setting