rpms/dracut/F-12 dracut-004-emergency.patch, NONE, 1.1 dracut.spec, 1.45, 1.46

[Harald Hoyer]

Author: harald

Update of /cvs/pkgs/rpms/dracut/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14493

Modified Files:
	dracut.spec 
Added Files:
	dracut-004-emergency.patch 
Log Message:
* Wed Jan 20 2010 Harald Hoyer <harald at redhat.com> 004-2
- fix emergency_shell argument parsing
- Related: rhbz#543948


dracut-004-emergency.patch:
 init |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE dracut-004-emergency.patch ---
commit 5db587d7c118afc47b50b4872100b508c84646fa
Author: Harald Hoyer <harald at redhat.com>
Date:   Wed Jan 20 16:04:55 2010 +0100

    init: fixed emergency_shell argument parsing

diff --git a/modules.d/99base/init b/modules.d/99base/init
index 8dc00a9..ab033a7 100755
--- a/modules.d/99base/init
+++ b/modules.d/99base/init
@@ -35,7 +35,7 @@ wait_for_loginit()
 
 emergency_shell()
 {
-    if [ $1 = "-n" ]; then
+    if [ "$1" = "-n" ]; then
         _rdshell_name=$2
         shift 2 
     else


Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-12/dracut.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- dracut.spec	19 Jan 2010 10:42:58 -0000	1.45
+++ dracut.spec	26 Jan 2010 09:15:39 -0000	1.46
@@ -20,7 +20,7 @@
 
 Name: dracut
 Version: 004
-Release: 1%{?rdist}
+Release: 2%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -28,6 +28,7 @@ URL: http://apps.sourceforge.net/trac/dr
 # Source can be generated by 
 # http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=snapshot;h=%{?dashgittag};sf=tgz
 Source0: dracut-%{version}%{?dashgittag}.tar.bz2
+Patch1:  dracut-004-emergency.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{?fedora} > 12 || 0%{?rhel} >= 6
@@ -130,8 +131,8 @@ This package requires everything which i
 kernel modules and firmware files needed by dracut modules.
 
 %package tools
-Requires: %{name} = %{version}-%{release}
 Summary: Dracut tools to build the local initramfs
+Requires: %{name} = %{version}-%{release}
 Requires: coreutils cryptsetup-luks device-mapper
 Requires: diffutils dmraid findutils gawk grep lvm2
 Requires: module-init-tools sed
@@ -142,6 +143,7 @@ This package contains tools to assemble 
 
 %prep
 %setup -q -n %{name}-%{version}%{?dashgittag}
+%patch1 -p1
 
 %build
 make WITH_SWITCH_ROOT=0%{?with_switch_root}
@@ -245,6 +247,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Wed Jan 20 2010 Harald Hoyer <harald at redhat.com> 004-2
+- fix emergency_shell argument parsing
+- Related: rhbz#543948
+
 * Fri Jan 15 2010 Harald Hoyer <harald at redhat.com> 004-1
 - version 004
 - Resolves: rhbz#529339 rhbz#533494 rhbz#548550