From feffeadaeeb6e64693141e44cb0112899cbda612 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Jan 23 2012 12:53:40 +0000
Subject: update to latest git


---

diff --git a/0061-iscsi-multipath-also-search-in-drivers-s390-scsi.patch b/0061-iscsi-multipath-also-search-in-drivers-s390-scsi.patch
new file mode 100644
index 0000000..76a7b63
--- /dev/null
+++ b/0061-iscsi-multipath-also-search-in-drivers-s390-scsi.patch
@@ -0,0 +1,36 @@
+From 4fcd5409e09e693349e991bd2a78303114a735f5 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Mon, 23 Jan 2012 12:35:41 +0100
+Subject: [PATCH] iscsi/multipath: also search in drivers/s390/scsi
+
+---
+ modules.d/90multipath/module-setup.sh |    2 +-
+ modules.d/95iscsi/module-setup.sh     |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh
+index 1502f59..f3b40bc 100755
+--- a/modules.d/90multipath/module-setup.sh
++++ b/modules.d/90multipath/module-setup.sh
+@@ -45,7 +45,7 @@ installkernel() {
+         done
+     }
+ 
+-    ( find_kernel_modules_by_path drivers/scsi;
++    ( find_kernel_modules_by_path drivers/scsi drivers/s390/scsi ;
+       find_kernel_modules_by_path drivers/md )  |  mp_mod_filter  |  instmods
+     [[ $debug ]] && set -x
+ }
+diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh
+index 560507c..5738941 100755
+--- a/modules.d/95iscsi/module-setup.sh
++++ b/modules.d/95iscsi/module-setup.sh
+@@ -52,7 +52,7 @@ installkernel() {
+             esac
+         done
+     }
+-    find_kernel_modules_by_path drivers/scsi \
++    find_kernel_modules_by_path drivers/scsi drivers/s390/scsi \
+     | iscsi_module_filter  |  instmods
+ }
+ 
diff --git a/0062-dracut-_get_fs_type-also-handle-dev-block-maj-min.patch b/0062-dracut-_get_fs_type-also-handle-dev-block-maj-min.patch
new file mode 100644
index 0000000..101ee31
--- /dev/null
+++ b/0062-dracut-_get_fs_type-also-handle-dev-block-maj-min.patch
@@ -0,0 +1,24 @@
+From 4f10ae2b86af35051ec07e8710578501d1cf1e0a Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Mon, 23 Jan 2012 13:49:39 +0100
+Subject: [PATCH] dracut: _get_fs_type() also handle /dev/block/maj:min
+
+---
+ dracut |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/dracut b/dracut
+index f2e5feb..db97b58 100755
+--- a/dracut
++++ b/dracut
+@@ -574,6 +574,10 @@ _get_fs_type() (
+         echo "$1|$ID_FS_TYPE"
+         return 1
+     fi
++    if [[ -b /dev/block/$1 ]] && get_fs_env /dev/block/$1; then
++        echo "/dev/block/$1|$ID_FS_TYPE"
++        return 1
++    fi
+     if fstype=$(find_dev_fstype $1); then
+         echo "$1|$fstype"
+         return 1
diff --git a/0063-dracut-functions-get_maj_min-major-and-minor-was-swa.patch b/0063-dracut-functions-get_maj_min-major-and-minor-was-swa.patch
new file mode 100644
index 0000000..80c59d1
--- /dev/null
+++ b/0063-dracut-functions-get_maj_min-major-and-minor-was-swa.patch
@@ -0,0 +1,22 @@
+From 74132a10f35685a05a728d598d4e7f9905b3e35b Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Mon, 23 Jan 2012 13:50:05 +0100
+Subject: [PATCH] dracut-functions: get_maj_min() major and minor was swapped
+
+---
+ dracut-functions |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/dracut-functions b/dracut-functions
+index 3852478..e04b16d 100755
+--- a/dracut-functions
++++ b/dracut-functions
+@@ -180,7 +180,7 @@ get_fs_uuid() (
+ 
+ get_maj_min() {
+     local _dev
+-    _dev=$(stat -L -c '$((0x%T)):$((0x%t))' "$1" 2>/dev/null)
++    _dev=$(stat -L -c '$((0x%t)):$((0x%T))' "$1" 2>/dev/null)
+     _dev=$(eval "echo $_dev")
+     echo $_dev
+ }
diff --git a/0064-90crypt-module-setup.sh-prepend-luks-to-hostonly-cmd.patch b/0064-90crypt-module-setup.sh-prepend-luks-to-hostonly-cmd.patch
new file mode 100644
index 0000000..3dec3ff
--- /dev/null
+++ b/0064-90crypt-module-setup.sh-prepend-luks-to-hostonly-cmd.patch
@@ -0,0 +1,23 @@
+From 5f282199c8362abce7e06adde909a24a47181008 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Mon, 23 Jan 2012 13:50:27 +0100
+Subject: [PATCH] 90crypt/module-setup.sh: prepend "luks-" to hostonly cmdline
+ file
+
+---
+ modules.d/90crypt/module-setup.sh |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh
+index a92c187..9dc55f5 100755
+--- a/modules.d/90crypt/module-setup.sh
++++ b/modules.d/90crypt/module-setup.sh
+@@ -20,7 +20,7 @@ check() {
+                 break
+                 done)
+         [[ ${ID_FS_UUID} ]] || continue
+-        echo " rd.luks.uuid=${ID_FS_UUID} " >> "${initdir}/etc/cmdline.d/90crypt.conf"
++        echo " rd.luks.uuid=luks-${ID_FS_UUID} " >> "${initdir}/etc/cmdline.d/90crypt.conf"
+     }
+ 
+     [[ $hostonly ]] || [[ $mount_needs ]] && {
diff --git a/dracut.spec b/dracut.spec
index a2936e0..dbac75b 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -10,7 +10,7 @@
 
 Name: dracut
 Version: 014
-Release: 61.git20120123%{?dist}
+Release: 65.git20120123%{?dist}
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora} || 0%{?rhel} > 6
@@ -84,6 +84,10 @@ Patch57: 0057-dracut-dracut.8.xml-added-more-documentation-about-L.patch
 Patch58: 0058-98usrmount-mount-usr.sh-do-not-mount-usr-read-only.patch
 Patch59: 0059-40network-also-look-in-drivers-s390-net-for-network-.patch
 Patch60: 0060-fix-rpm-build-error-after-adding-ssh-client-module.patch
+Patch61: 0061-iscsi-multipath-also-search-in-drivers-s390-scsi.patch
+Patch62: 0062-dracut-_get_fs_type-also-handle-dev-block-maj-min.patch
+Patch63: 0063-dracut-functions-get_maj_min-major-and-minor-was-swa.patch
+Patch64: 0064-90crypt-module-setup.sh-prepend-luks-to-hostonly-cmd.patch
 
 
 BuildArch: noarch
@@ -361,6 +365,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Mon Jan 23 2012 Harald Hoyer <harald@redhat.com> 014-65.git20120123
+- update to latest git
+
 * Mon Jan 23 2012 Harald Hoyer <harald@redhat.com> 014-61.git20120123
 - update to latest git