From 656b7a67b5b0b1aad4d086daf01d9b4bb096f4fa Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 26 Jan 2012 18:11:05 +0100 Subject: [PATCH] update to latest git --- 0076-fix-kernel-modules-search-for-s390.patch | 37 +++++++++++++++++++ dracut.spec | 6 ++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 0076-fix-kernel-modules-search-for-s390.patch diff --git a/0076-fix-kernel-modules-search-for-s390.patch b/0076-fix-kernel-modules-search-for-s390.patch new file mode 100644 index 0000000..1137115 --- /dev/null +++ b/0076-fix-kernel-modules-search-for-s390.patch @@ -0,0 +1,37 @@ +From e684ee786a291cac8d443094817e4246c0ce31a6 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Thu, 26 Jan 2012 18:08:46 +0100 +Subject: [PATCH] fix kernel modules search for s390 + +forgot last ; in {} +--- + modules.d/40network/module-setup.sh | 2 +- + modules.d/95iscsi/module-setup.sh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh +index 384baf1..ef7818a 100755 +--- a/modules.d/40network/module-setup.sh ++++ b/modules.d/40network/module-setup.sh +@@ -58,7 +58,7 @@ installkernel() { + [[ $debug ]] && set -x + } + +- { find_kernel_modules_by_path drivers/net; find_kernel_modules_by_path drivers/s390/net } \ ++ { find_kernel_modules_by_path drivers/net; find_kernel_modules_by_path drivers/s390/net; } \ + | net_module_filter | instmods + + instmods ecb arc4 +diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh +index 4b7e292..078682c 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/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 ea51192..144757d 100644 --- a/dracut.spec +++ b/dracut.spec @@ -10,7 +10,7 @@ Name: dracut Version: 014 -Release: 76.git20120126%{?dist} +Release: 77.git20120126%{?dist} Summary: Initramfs generator using udev %if 0%{?fedora} || 0%{?rhel} > 6 @@ -99,6 +99,7 @@ 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 +Patch76: 0076-fix-kernel-modules-search-for-s390.patch BuildArch: noarch @@ -383,6 +384,9 @@ rm -rf $RPM_BUILD_ROOT %dir /var/lib/dracut/overlay %changelog +* Thu Jan 26 2012 Harald Hoyer 014-77.git20120126 +- update to latest git + * Thu Jan 26 2012 Harald Hoyer 014-76.git20120126 - update to latest git