From 181ae552a585dc92667d2290547c6354de030b1b Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Wed, 31 Jul 2013 17:40:53 +0200
Subject: dracut-031-6.git20130731

- cmssetup: fixed port for zfcp.conf
- lvm: call lvchange with --yes to boot from snapshots
---
 0004-lvm-add-yes-to-lvm-lvchange.patch             | 25 ++++++++++++++++
 ...ms-cmssetup.sh-correct-port-for-zfcp.conf.patch | 34 ++++++++++++++++++++++
 dracut.spec                                        |  8 ++++-
 3 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 0004-lvm-add-yes-to-lvm-lvchange.patch
 create mode 100644 0005-cms-cmssetup.sh-correct-port-for-zfcp.conf.patch

diff --git a/0004-lvm-add-yes-to-lvm-lvchange.patch b/0004-lvm-add-yes-to-lvm-lvchange.patch
new file mode 100644
index 0000000..1665007
--- /dev/null
+++ b/0004-lvm-add-yes-to-lvm-lvchange.patch
@@ -0,0 +1,25 @@
+From 051de5aadcd8cf1638fb86b89916f7184b30991a Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Wed, 31 Jul 2013 17:17:37 +0200
+Subject: [PATCH] lvm: add "--yes" to lvm lvchange
+
+---
+ modules.d/90lvm/lvm_scan.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules.d/90lvm/lvm_scan.sh b/modules.d/90lvm/lvm_scan.sh
+index cc006c8..85ecd4d 100755
+--- a/modules.d/90lvm/lvm_scan.sh
++++ b/modules.d/90lvm/lvm_scan.sh
+@@ -108,9 +108,9 @@ if [ -n "$LVS" ] ; then
+     info "Scanning devices $lvmdevs for LVM logical volumes $LVS"
+     lvm lvscan --ignorelockingfailure 2>&1 | vinfo
+     if [ -z "$sysinit" ]; then
+-        lvm lvchange -ay --ignorelockingfailure $nopoll --ignoremonitoring $LVS 2>&1 | vinfo
++        lvm lvchange --yes -ay --ignorelockingfailure $nopoll --ignoremonitoring $LVS 2>&1 | vinfo
+     else
+-        lvm lvchange -ay $sysinit $LVS 2>&1 | vinfo
++        lvm lvchange --yes -ay $sysinit $LVS 2>&1 | vinfo
+     fi
+ fi
+ 
diff --git a/0005-cms-cmssetup.sh-correct-port-for-zfcp.conf.patch b/0005-cms-cmssetup.sh-correct-port-for-zfcp.conf.patch
new file mode 100644
index 0000000..feca8d9
--- /dev/null
+++ b/0005-cms-cmssetup.sh-correct-port-for-zfcp.conf.patch
@@ -0,0 +1,34 @@
+From 64a7eace88b30f3ea03df86ddceb23d4949b692d Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Wed, 31 Jul 2013 17:28:04 +0200
+Subject: [PATCH] cms/cmssetup.sh: correct port for zfcp.conf
+
+---
+ modules.d/80cms/cmssetup.sh | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/modules.d/80cms/cmssetup.sh b/modules.d/80cms/cmssetup.sh
+index 16704c3..36955bc 100755
+--- a/modules.d/80cms/cmssetup.sh
++++ b/modules.d/80cms/cmssetup.sh
+@@ -182,7 +182,19 @@ function dasd_settle_all() {
+ 
+         unset _do_zfcp
+         for i in ${!FCP_*}; do
+-	    echo "${!i}" >> /etc/zfcp.conf
++	    echo "${!i}" | while read port rest; do
++                case $port in
++                *.*.*)
++                    ;;
++                *.*)
++                    port="0.$port"
++                    ;;
++                *)
++                    port="0.0.$port"
++                    ;;
++                esac
++                echo $port $rest >> /etc/zfcp.conf
++            done
+ 	    _do_zfcp=1
+         done
+         [[ $_do_zfcp ]] && zfcp_cio_free
diff --git a/dracut.spec b/dracut.spec
index 0bc9d51..e670d61 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -10,7 +10,7 @@
 
 Name: dracut
 Version: 031
-Release: 4.git20130731%{?dist}
+Release: 6.git20130731%{?dist}
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora} || 0%{?rhel}
@@ -32,6 +32,8 @@ Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar
 Patch1: 0001-Generate-correct-ifcfg-file-for-vlan-option.patch
 Patch2: 0002-Revert-base-setup-correct-system-time-and-time-zone-.patch
 Patch3: 0003-Change-the-implementation-of-action_on_fail.patch
+Patch4: 0004-lvm-add-yes-to-lvm-lvchange.patch
+Patch5: 0005-cms-cmssetup.sh-correct-port-for-zfcp.conf.patch
 
 
 BuildRequires: bash git
@@ -447,6 +449,10 @@ rm -rf -- $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Jul 31 2013 Harald Hoyer <harald@redhat.com> 031-6.git20130731
+- cmssetup: fixed port for zfcp.conf
+- lvm: call lvchange with --yes to boot from snapshots
+
 * Wed Jul 31 2013 Harald Hoyer <harald@redhat.com> 031-4.git20130731
 - remove action_on_fail kernel command line parameter
 
-- 
cgit