dracut-043-173.git20151116

- git snapshot
This commit is contained in:
Harald Hoyer 2015-11-16 09:29:18 +01:00
parent ab28610de1
commit 7e8da8df0d
2 changed files with 40 additions and 1 deletions

View File

@ -0,0 +1,35 @@
From 63a44c8dc31f3168c85d9851619af2876cda4d00 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Mon, 16 Nov 2015 09:24:50 +0100
Subject: [PATCH] dracut.sh: add back host_modules part
host_modules was removed accidently while remove host_modaliases
---
dracut.sh | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/dracut.sh b/dracut.sh
index a21295d..be4c107 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -1100,6 +1100,8 @@ if (( ${#add_device_l[@]} )); then
push_host_devs "${add_device_l[@]}"
fi
+declare -A host_modules
+
if [[ $hostonly ]]; then
# in hostonly mode, determine all devices, which have to be accessed
# and examine them for filesystem types
@@ -1187,6 +1189,11 @@ if [[ $hostonly ]]; then
fi
done < /etc/fstab
fi
+
+ # check /proc/modules
+ while read m rest || [ -n "$m" ]; do
+ host_modules["$m"]=1
+ done </proc/modules
fi
unset m

View File

@ -16,7 +16,7 @@
Name: dracut Name: dracut
Version: 043 Version: 043
Release: 172.git20151113%{?dist} Release: 173.git20151116%{?dist}
Summary: Initramfs generator using udev Summary: Initramfs generator using udev
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
@ -206,6 +206,7 @@ Patch168: 0168-dracut.sh-remove-the-concept-of-host_modalias.patch
Patch169: 0169-Check-rd.zfcp-format-in-dracut-hook-cmdline-process-.patch Patch169: 0169-Check-rd.zfcp-format-in-dracut-hook-cmdline-process-.patch
Patch170: 0170-dracut-init.sh-libdir-paths-need-dracut-function.sh.patch Patch170: 0170-dracut-init.sh-libdir-paths-need-dracut-function.sh.patch
Patch171: 0171-iscsi-parse-iscsiroot.sh-reload-udev-rules.patch Patch171: 0171-iscsi-parse-iscsiroot.sh-reload-udev-rules.patch
Patch172: 0172-dracut.sh-add-back-host_modules-part.patch
Source1: https://www.gnu.org/licenses/lgpl-2.1.txt Source1: https://www.gnu.org/licenses/lgpl-2.1.txt
@ -666,6 +667,9 @@ rm -rf -- $RPM_BUILD_ROOT
%endif %endif
%changelog %changelog
* Mon Nov 16 2015 Harald Hoyer <harald@redhat.com> - 043-173.git20151116
- git snapshot
* Fri Nov 13 2015 Harald Hoyer <harald@redhat.com> - 043-172.git20151113 * Fri Nov 13 2015 Harald Hoyer <harald@redhat.com> - 043-172.git20151113
- git snapshot - git snapshot