[dracut/f17] dracut-017-40.git20120308

[Harald Hoyer]

commit 0e9e569b557fa7e09f954a08bac7cb1853f2117a
Author: Harald Hoyer <harald at redhat.com>
Date:   Thu Mar 8 14:41:08 2012 +0100

    dracut-017-40.git20120308
    
    - add s390 ctcm network kernel module

 0039-install-ctcm-network-module-on-s390.patch |   26 ++++++++++++++++++++++++
 dracut.spec                                    |    6 ++++-
 2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/0039-install-ctcm-network-module-on-s390.patch b/0039-install-ctcm-network-module-on-s390.patch
new file mode 100644
index 0000000..0bfd39d
--- /dev/null
+++ b/0039-install-ctcm-network-module-on-s390.patch
@@ -0,0 +1,26 @@
+From 2ff3fc73c81e0170c46683589d9ad705f3a5ad45 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
+Date: Fri, 2 Mar 2012 11:41:37 +0100
+Subject: [PATCH] install ctcm network module on s390
+
+The ctcm module is not loaded automagically because it doesn't pass the
+"ether_type_trans" test in 40net/module-setup.sh, so load it explicitly.
+---
+ modules.d/95znet/module-setup.sh |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/modules.d/95znet/module-setup.sh b/modules.d/95znet/module-setup.sh
+index fbb79aa..b354947 100755
+--- a/modules.d/95znet/module-setup.sh
++++ b/modules.d/95znet/module-setup.sh
+@@ -13,6 +13,10 @@ depends() {
+     return 0
+ }
+ 
++installkernel() {
++    instmods ctcm
++}
++
+ install() {
+     inst_hook cmdline 30 "$moddir/parse-ccw.sh"
+     inst /lib/udev/ccw_init
diff --git a/dracut.spec b/dracut.spec
index f7f3dba..16f27f9 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -10,7 +10,7 @@
 
 Name: dracut
 Version: 017
-Release: 39.git20120308%{?dist}
+Release: 40.git20120308%{?dist}
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora} || 0%{?rhel}
@@ -62,6 +62,7 @@ Patch35: 0035-add-initqueue-env-and-online-hook.patch
 Patch36: 0036-TEST-20-NFS-test.sh-fsck-with-a.patch
 Patch37: 0037-95iscsi-iscsiroot.sh-fix-for-empty-root.patch
 Patch38: 0038-dracut.spec-add-98pollcdrom.patch
+Patch39: 0039-install-ctcm-network-module-on-s390.patch
 
 
 BuildArch: noarch
@@ -366,6 +367,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Thu Mar 08 2012 Harald Hoyer <harald at redhat.com> 017-40.git20120308
+- add s390 ctcm network kernel module
+
 * Thu Mar 08 2012 Harald Hoyer <harald at redhat.com> 017-39.git20120308
 - kill dhclient silently
 - cleanup and fix network config writeout to /run/initramfs/state