[dracut/f16] install modules.order
Harald Hoyer
harald at fedoraproject.org
Mon Jan 23 12:02:00 UTC 2012
commit 0d5dacf69ef96e3ee4893b0500b5d1b627b627d5
Author: Harald Hoyer <harald at redhat.com>
Date: Mon Jan 23 11:57:05 2012 +0100
install modules.order
0030-90mdraid-fix-adjust-force-run-script.patch | 34 ++++++------
...ix-adjust-65-md-rules-and-related-scripts.patch | 29 ++++++-----
...dules-module-setup.sh-install-modules.ord.patch | 42 +++++++++++++++
...draid-wait-for-md-devices-to-become-clean.patch | 55 ++++++++++++++++++++
dracut.spec | 8 ++-
5 files changed, 137 insertions(+), 31 deletions(-)
---
diff --git a/0030-90mdraid-fix-adjust-force-run-script.patch b/0030-90mdraid-fix-adjust-force-run-script.patch
index 3370f3a..0238645 100644
--- a/0030-90mdraid-fix-adjust-force-run-script.patch
+++ b/0030-90mdraid-fix-adjust-force-run-script.patch
@@ -45,10 +45,10 @@ itself, and they should not be an issue.
Signed-off-by: Michal Soltys <soltys at ziu.info>
---
- modules.d/90mdraid/mdraid_start.sh | 47 ++++++++++++++++++++++-------------
+ modules.d/90mdraid/mdraid_start.sh | 51 ++++++++++++++++++++++--------------
modules.d/90mdraid/module-setup.sh | 2 +-
modules.d/90mdraid/parse-md.sh | 1 +
- 3 files changed, 31 insertions(+), 19 deletions(-)
+ 3 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/modules.d/90mdraid/mdraid_start.sh b/modules.d/90mdraid/mdraid_start.sh
index 4c0255e..be5a3ce 100755
@@ -63,17 +63,7 @@ index 4c0255e..be5a3ce 100755
-udevadm control --stop-exec-queue
-mdadm -As --auto=yes --run 2>&1 | vinfo
-mdadm -Is --run 2>&1 | vinfo
-+_md_force_run() {
-+ local _udevinfo
-+ local _path_s
-+ local _path_d
-+ # try to force-run anything not running yet
-+ for md in /dev/md[0-9]*; do
-+ [ -b "$md" ] || continue
-+ _udevinfo="$(udevadm info --query=env --name="$md")"
-+ strstr "$_udevinfo" "MD_LEVEL=container" && continue
-+ strstr "$_udevinfo" "DEVTYPE=partition" && continue
-
+-
-# there could still be some leftover devices
-# which have had a container added
-for md in /dev/md[0-9]* /dev/md/*; do
@@ -85,11 +75,23 @@ index 4c0255e..be5a3ce 100755
- mdadm --run "$md" 2>&1 | vinfo
-done
-unset udevinfo
-+ _path_s="$(udevadm info -q path -n "$md")/md/array_state"
-+ [ ! -r "$_path_s" ] && continue
-
+-
-ln -s $(command -v mdraid-cleanup) $hookdir/pre-pivot/31-mdraid-cleanup.sh 2>/dev/null
-udevadm control --start-exec-queue
++_md_force_run() {
++ local _udevinfo
++ local _path_s
++ local _path_d
++ # try to force-run anything not running yet
++ for md in /dev/md[0-9]*; do
++ [ -b "$md" ] || continue
++ _udevinfo="$(udevadm info --query=env --name="$md")"
++ strstr "$_udevinfo" "MD_LEVEL=container" && continue
++ strstr "$_udevinfo" "DEVTYPE=partition" && continue
++
++ _path_s="$(udevadm info -q path -n "$md")/md/array_state"
++ [ ! -r "$_path_s" ] && continue
++
+ # inactive ?
+ [ "$(cat "$_path_s")" != "inactive" ] && continue
+
diff --git a/0032-90mdraid-fix-adjust-65-md-rules-and-related-scripts.patch b/0032-90mdraid-fix-adjust-65-md-rules-and-related-scripts.patch
index ae08daf..f723b1b 100644
--- a/0032-90mdraid-fix-adjust-65-md-rules-and-related-scripts.patch
+++ b/0032-90mdraid-fix-adjust-65-md-rules-and-related-scripts.patch
@@ -30,12 +30,12 @@ the following:
Signed-off-by: Michal Soltys <soltys at ziu.info>
---
- modules.d/90mdraid/65-md-incremental-imsm.rules | 73 ++++++++---------------
+ modules.d/90mdraid/65-md-incremental-imsm.rules | 79 ++++++++---------------
modules.d/90mdraid/md_finished.sh | 9 ---
modules.d/90mdraid/mdadm_auto.sh | 2 +-
modules.d/90mdraid/module-setup.sh | 1 -
modules.d/90mdraid/parse-md.sh | 8 ++-
- 5 files changed, 31 insertions(+), 62 deletions(-)
+ 5 files changed, 34 insertions(+), 65 deletions(-)
delete mode 100755 modules.d/90mdraid/md_finished.sh
diff --git a/modules.d/90mdraid/65-md-incremental-imsm.rules b/modules.d/90mdraid/65-md-incremental-imsm.rules
@@ -49,24 +49,27 @@ index bb030cf..209b17b 100644
-ACTION!="add|change", GOTO="md_inc_end"
-SUBSYSTEM!="block", GOTO="md_inc_end"
-ENV{ID_FS_TYPE}!="*_raid_member", GOTO="md_inc_end"
+-
+-ENV{ID_FS_TYPE}=="isw_raid_member", ENV{rd_NO_MDIMSM}=="?*", GOTO="md_inc_end"
+-ENV{ID_FS_TYPE}=="ddf_raid_member", ENV{rd_NO_MDDDF}=="?*", GOTO="md_inc_end"
+-
+-ENV{rd_NO_MD}=="?*", GOTO="md_inc_end"
+-
+-PROGRAM=="/bin/sh -c 'for i in $sys/$devpath/holders/md[0-9]*; do [ -e $$i ] && exit 0; done; exit 1;' ", \
+- GOTO="md_inc_end"
+ACTION!="add|change", GOTO="md_end"
+SUBSYSTEM!="block", GOTO="md_end"
+ENV{rd_NO_MD}=="?*", GOTO="md_end"
+KERNEL=="md*", GOTO="md_end"
-
--ENV{ID_FS_TYPE}=="isw_raid_member", ENV{rd_NO_MDIMSM}=="?*", GOTO="md_inc_end"
--ENV{ID_FS_TYPE}=="ddf_raid_member", ENV{rd_NO_MDDDF}=="?*", GOTO="md_inc_end"
++
+ENV{ID_FS_TYPE}!="*_raid_member", GOTO="md_end"
+ENV{ID_FS_TYPE}=="isw_raid_member", ENV{rd_NO_MDIMSM}=="?*", GOTO="md_end"
+ENV{ID_FS_TYPE}=="ddf_raid_member", ENV{rd_NO_MDDDF}=="?*", GOTO="md_end"
-
--ENV{rd_NO_MD}=="?*", GOTO="md_inc_end"
++
+# already done ?
+PROGRAM="/bin/sh -c 'for i in $sys/$devpath/holders/md[0-9]*; do [ -e $$i ] && exit 0; done; exit 1;' ", \
+ GOTO="md_end"
-
--PROGRAM=="/bin/sh -c 'for i in $sys/$devpath/holders/md[0-9]*; do [ -e $$i ] && exit 0; done; exit 1;' ", \
-- GOTO="md_inc_end"
++
+# for native arrays - array's uuid has to be specified
+# for containers - container's uuid has to be specified
+# TODO : how to get embedded array's uuid having container's component ?
@@ -108,8 +111,7 @@ index bb030cf..209b17b 100644
-RUN+="/sbin/mdadm -I $env{DEVNAME}"
-
-RUN+="/sbin/initqueue --finished --unique --name md_finished /sbin/md_finished.sh"
-+LABEL="md_incremental"
-
+-
-LABEL="md_inc_end"
-
-#
@@ -122,7 +124,8 @@ index bb030cf..209b17b 100644
- ENV{rd_MDADMCONF}!="?*", \
- ENV{rd_NO_MD}!="?*", \
- GOTO="do_raidstart"
--
++LABEL="md_incremental"
+
-GOTO="end_raidstart"
-
-LABEL="do_raidstart"
diff --git a/0070-90kernel-modules-module-setup.sh-install-modules.ord.patch b/0070-90kernel-modules-module-setup.sh-install-modules.ord.patch
new file mode 100644
index 0000000..fa52d38
--- /dev/null
+++ b/0070-90kernel-modules-module-setup.sh-install-modules.ord.patch
@@ -0,0 +1,42 @@
+From 9fd1f412ed95b0cf1a798e73680c2bf1333ac293 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Fri, 20 Jan 2012 12:06:41 +0100
+Subject: [PATCH] 90kernel-modules/module-setup.sh: install modules.order
+
+Also install modules.order and all modules.builtin*
+---
+ modules.d/90kernel-modules/module-setup.sh | 11 ++++++-----
+ 1 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
+index 0252502..f575e85 100755
+--- a/modules.d/90kernel-modules/module-setup.sh
++++ b/modules.d/90kernel-modules/module-setup.sh
+@@ -47,7 +47,7 @@ installkernel() {
+ }
+
+ install() {
+- local _f
++ local _f i
+ [ -f /etc/modprobe.conf ] && dracut_install /etc/modprobe.conf
+ for i in $(find /etc/modprobe.d/ -type f -name '*.conf'); do
+ inst_simple "$i"
+@@ -55,13 +55,14 @@ install() {
+ inst_hook cmdline 01 "$moddir/parse-kernel.sh"
+ inst_simple "$moddir/insmodpost.sh" /sbin/insmodpost.sh
+
+- local f
+-
+ for _f in modules.builtin.bin modules.builtin; do
+- [[ $srcmods/$_f ]] && inst_simple "$srcmods/$_f" "/lib/modules/$kernel/$_f" \
+- && break
++ [[ $srcmods/$_f ]] && break
+ done || {
+ dfatal "No modules.builtin.bin and modules.builtin found!"
+ return 1
+ }
++
++ for _f in modules.builtin.bin modules.builtin modules.order; do
++ [[ $srcmods/$_f ]] && inst_simple "$srcmods/$_f" "/lib/modules/$kernel/$_f"
++ done
+ }
diff --git a/0071-Revert-90mdraid-wait-for-md-devices-to-become-clean.patch b/0071-Revert-90mdraid-wait-for-md-devices-to-become-clean.patch
new file mode 100644
index 0000000..856e416
--- /dev/null
+++ b/0071-Revert-90mdraid-wait-for-md-devices-to-become-clean.patch
@@ -0,0 +1,55 @@
+From 0837829c7b8454cf3d8a991a3605ad5a193fc505 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Mon, 23 Jan 2012 11:53:25 +0100
+Subject: [PATCH] Revert "90mdraid: wait for md devices to become clean"
+
+This reverts commit e8afcd2b866da7f1af56d5ccaa395eec6500f135.
+---
+ modules.d/90mdraid/mdraid-waitclean.sh | 25 -------------------------
+ modules.d/90mdraid/module-setup.sh | 1 -
+ 2 files changed, 0 insertions(+), 26 deletions(-)
+ delete mode 100755 modules.d/90mdraid/mdraid-waitclean.sh
+
+diff --git a/modules.d/90mdraid/mdraid-waitclean.sh b/modules.d/90mdraid/mdraid-waitclean.sh
+deleted file mode 100755
+index c062fc7..0000000
+--- a/modules.d/90mdraid/mdraid-waitclean.sh
++++ /dev/null
+@@ -1,25 +0,0 @@
+-#!/bin/sh
+-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+-# ex: ts=8 sw=4 sts=4 et filetype=sh
+-
+-type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
+-
+-containers=""
+-for md in /dev/md[0-9_]*; do
+- [ -b "$md" ] || continue
+- udevinfo="$(udevadm info --query=env --name=$md)"
+- strstr "$udevinfo" "DEVTYPE=partition" && continue
+- if strstr "$udevinfo" "MD_LEVEL=container"; then
+- containers="$containers $md"
+- continue
+- fi
+- info "Waiting for $md to become clean"
+- mdadm -W "$md" >/dev/null 2>&1
+-done
+-
+-for md in $containers; do
+- info "Waiting for $md to become clean"
+- mdadm -W "$md" >/dev/null 2>&1
+-done
+-
+-unset containers udevinfo
+diff --git a/modules.d/90mdraid/module-setup.sh b/modules.d/90mdraid/module-setup.sh
+index 029d667..fe793bb 100755
+--- a/modules.d/90mdraid/module-setup.sh
++++ b/modules.d/90mdraid/module-setup.sh
+@@ -83,7 +83,6 @@ install() {
+ inst "$moddir/mdraid_start.sh" /sbin/mdraid_start
+ inst "$moddir/mdadm_auto.sh" /sbin/mdadm_auto
+ inst_hook pre-trigger 30 "$moddir/parse-md.sh"
+- inst_hook pre-mount 10 "$moddir/mdraid-waitclean.sh"
+ inst "$moddir/mdraid-cleanup.sh" /sbin/mdraid-cleanup
+ inst_hook shutdown 30 "$moddir/md-shutdown.sh"
+ }
diff --git a/dracut.spec b/dracut.spec
index e292e0a..abe1dfb 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -8,7 +8,7 @@
Name: dracut
Version: 013
-Release: 20%{?dist}
+Release: 72.git20120123%{?dist}
Summary: Initramfs generator using udev
%if 0%{?fedora} || 0%{?rhel} > 6
@@ -85,10 +85,14 @@ Patch60: 0060-Makefile-git2spec.pl-use-temporary-builddir.patch
Patch61: 0061-90kernel-modules-module-setup.sh-include-usb-mass-st.patch
Patch62: 0062-90mdraid-remove-mdadm_auto.sh-completly.patch
Patch63: 0063-cryptroot-ask.sh-use-key-file-if-specified-in-cryptt.patch
-#Patch64: 0064-90mdraid-wait-for-md-devices-to-become-clean.patch
+Patch64: 0064-90mdraid-wait-for-md-devices-to-become-clean.patch
Patch65: 0065-99base-init-only-poll-cdroms-if-the-kernel-does-supp.patch
Patch66: 0066-99base-init-removed-cdrom-polling-reset-code.patch
Patch67: 0067-99base-init-fix-check-for-in-kernel-polling.patch
+Patch68: 0068-dracut-add-install_items-to-dracut.conf.patch
+Patch69: 0069-git2spec.pl-strip-path-from-patches.patch
+Patch70: 0070-90kernel-modules-module-setup.sh-install-modules.ord.patch
+Patch71: 0071-Revert-90mdraid-wait-for-md-devices-to-become-clean.patch
BuildArch: noarch
More information about the scm-commits
mailing list