[dracut/f17] dracut-018-52.git20120605

[Harald Hoyer]

commit d69922b09d347696d7cc75ffac7e0dfeefb70b1e
Author: Harald Hoyer <harald at redhat.com>
Date:   Tue Jun 5 20:25:25 2012 +0200

    dracut-018-52.git20120605
    
    - change rd.dasd to dasd_mod kernel parameter

 ...ange-rd.dasd-to-dasd_mod-kernel-parameter.patch |   85 ++++++++++++++++++++
 dracut.spec                                        |    6 +-
 2 files changed, 90 insertions(+), 1 deletions(-)
---
diff --git a/0051-dasd_mod-change-rd.dasd-to-dasd_mod-kernel-parameter.patch b/0051-dasd_mod-change-rd.dasd-to-dasd_mod-kernel-parameter.patch
new file mode 100644
index 0000000..6060eb8
--- /dev/null
+++ b/0051-dasd_mod-change-rd.dasd-to-dasd_mod-kernel-parameter.patch
@@ -0,0 +1,85 @@
+From a12c7982174ca599904c229d0b12b4cc9ba2a0f5 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Tue, 5 Jun 2012 20:23:35 +0200
+Subject: [PATCH] dasd_mod: change rd.dasd to dasd_mod kernel parameter
+
+---
+ dracut.cmdline.7.asc                   |    9 ++-------
+ modules.d/95dasd_mod/parse-dasd-mod.sh |   34 --------------------------------
+ 2 files changed, 2 insertions(+), 41 deletions(-)
+
+diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
+index eda72f1..884d194 100644
+--- a/dracut.cmdline.7.asc
++++ b/dracut.cmdline.7.asc
+@@ -417,14 +417,9 @@ NBD
+ 
+ DASD
+ ~~~~
+-**rd.dasd_mod.dasd=**....::
++**rd.dasd=**....::
+     same syntax as the kernel module parameter (s390 only)
+ 
+-**rd.dasd=**_<dasd_adaptor device bus ID>_[,readonly=_X_][,use_diag=_X_][,erplog=_X_]::
+-    activate DASD device with the given adaptor device bus ID and setting the
+-    sysfs attributes to the specified values. This parameter can be specified
+-    multiple times.
+-
+ ZFCP
+ ~~~~
+ **rd.zfcp=**_<zfcp adaptor device bus ID>_,_<WWPN>_,_<FCPLUN>_::
+@@ -493,7 +488,7 @@ rdbreak:: rd.break
+ 
+ rd_CCW:: rd.ccw
+ 
+-rd_DASD_MOD:: rd.dasd_mod.dasd
++rd_DASD_MOD:: rd.dasd
+ 
+ rd_DASD:: rd.dasd
+ 
+diff --git a/modules.d/95dasd_mod/parse-dasd-mod.sh b/modules.d/95dasd_mod/parse-dasd-mod.sh
+index 91c3274..c37aca8 100755
+--- a/modules.d/95dasd_mod/parse-dasd-mod.sh
++++ b/modules.d/95dasd_mod/parse-dasd-mod.sh
+@@ -3,41 +3,7 @@
+ # ex: ts=8 sw=4 sts=4 et filetype=sh
+ mod_args=""
+ 
+-convert_dasd_param() {
+-    local bus_id params
+-    params=""
+-    bus_id=$1; shift
+-    while [ $# -gt 0 ]; do
+-        case "$1" in
+-            use_diag\=1)
+-                params="$params:diag"
+-                ;;
+-            readonly\=1)
+-                params="$params:ro"
+-                ;;
+-            erplog\=1)
+-                params="$params:erplog"
+-                ;;
+-            failfast\=1)
+-                params="$params:failfast"
+-                ;;
+-        esac
+-        shift
+-    done
+-    params="${params#*:}"
+-    if [ -n "$params" ]; then
+-        echo "$bus_id($params)"
+-    else
+-        echo "$bus_id"
+-    fi
+-}
+-
+ for dasd_arg in $(getargs rd.dasd= rd_DASD= DASD=); do
+-    OLD_IFS=$IFS
+-    IFS=","
+-    set -- $dasd_arg
+-    IFS=$OLD_IFS
+-    dasd_arg=$(convert_dasd_param "$@")
+     mod_args="$mod_args,$dasd_arg"
+ done
+ 
diff --git a/dracut.spec b/dracut.spec
index c4cd791..d1776f3 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -10,7 +10,7 @@
 
 Name: dracut
 Version: 018
-Release: 51.git20120604%{?dist}
+Release: 52.git20120605%{?dist}
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora} || 0%{?rhel}
@@ -74,6 +74,7 @@ Patch47: 0047-fix-return-value-of-some-installkernel-functions.patch
 Patch48: 0048-dracut.sh-do-not-rely-on-the-presence-of-lib64-check.patch
 Patch49: 0049-Don-t-set-an-already-set-attribute-826357.patch
 Patch50: 0050-add-filesystem-options-to-fsck_single.patch
+Patch51: 0051-dasd_mod-change-rd.dasd-to-dasd_mod-kernel-parameter.patch
 
 
 BuildArch: noarch
@@ -389,6 +390,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Tue Jun 05 2012 Harald Hoyer <harald at redhat.com> 018-52.git20120605
+- change rd.dasd to dasd_mod kernel parameter
+
 * Mon Jun 04 2012 Harald Hoyer <harald at redhat.com> 018-51.git20120604
 - fix network rules for kdump
 Resolves: rhbz#822750