[dracut] update to latest git
Harald Hoyer
harald at fedoraproject.org
Thu Jan 26 16:35:49 UTC 2012
commit 4b0f24b3e39408b96764f9e4cb8403685e80b229
Author: Harald Hoyer <harald at redhat.com>
Date: Thu Jan 26 17:35:44 2012 +0100
update to latest git
0075-fix-kernel-modules-search-for-s390.patch | 55 +++++++++++++++++++++++++
dracut.spec | 6 ++-
2 files changed, 60 insertions(+), 1 deletions(-)
---
diff --git a/0075-fix-kernel-modules-search-for-s390.patch b/0075-fix-kernel-modules-search-for-s390.patch
new file mode 100644
index 0000000..6d6c2d6
--- /dev/null
+++ b/0075-fix-kernel-modules-search-for-s390.patch
@@ -0,0 +1,55 @@
+From c416b1de5a54ea83d29d99261324d8a4a403bc64 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Thu, 26 Jan 2012 17:30:06 +0100
+Subject: [PATCH] fix kernel modules search for s390
+
+find_kernel_modules_by_path only takes one parameter
+
+fixes c254ac796fe52d19ad47df99055cd58fee5e517e
+and 4fcd5409e09e693349e991bd2a78303114a735f5
+---
+ modules.d/40network/module-setup.sh | 3 ++-
+ modules.d/90multipath/module-setup.sh | 2 +-
+ modules.d/95iscsi/module-setup.sh | 2 +-
+ 3 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
+index 9017413..384baf1 100755
+--- a/modules.d/40network/module-setup.sh
++++ b/modules.d/40network/module-setup.sh
+@@ -58,7 +58,8 @@ installkernel() {
+ [[ $debug ]] && set -x
+ }
+
+- find_kernel_modules_by_path drivers/net drivers/s390/net | net_module_filter | instmods
++ { find_kernel_modules_by_path drivers/net; find_kernel_modules_by_path drivers/s390/net } \
++ | net_module_filter | instmods
+
+ instmods ecb arc4
+ # bridge modules
+diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh
+index f3b40bc..b78c005 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 drivers/s390/scsi ;
++ ( find_kernel_modules_by_path drivers/scsi; find_kernel_modules_by_path 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 d645dba..4b7e292 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 drivers/s390/scsi \
++ { find_kernel_modules_by_path drivers/scsi; find_kernel_modules_by_path drivers/s390/scsi } \
+ | iscsi_module_filter | instmods
+ }
+
diff --git a/dracut.spec b/dracut.spec
index 8cc88c5..ea51192 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -10,7 +10,7 @@
Name: dracut
Version: 014
-Release: 75.git20120126%{?dist}
+Release: 76.git20120126%{?dist}
Summary: Initramfs generator using udev
%if 0%{?fedora} || 0%{?rhel} > 6
@@ -98,6 +98,7 @@ Patch71: 0071-dracut.spec-add-compat-symlinks-to-sbin.patch
Patch72: 0072-usrmove-install-missing-binaries-and-set-x-only-for-.patch
Patch73: 0073-30usrmove-usrmove-convert.sh-rename-duplicate-librar.patch
Patch74: 0074-dracut.spec-create-compat-symlink-instead-of-ghost.patch
+Patch75: 0075-fix-kernel-modules-search-for-s390.patch
BuildArch: noarch
@@ -382,6 +383,9 @@ rm -rf $RPM_BUILD_ROOT
%dir /var/lib/dracut/overlay
%changelog
+* Thu Jan 26 2012 Harald Hoyer <harald at redhat.com> 014-76.git20120126
+- update to latest git
+
* Thu Jan 26 2012 Harald Hoyer <harald at redhat.com> 014-75.git20120126
- update to latest git
More information about the scm-commits
mailing list