[dracut/f16] dracut 013-19
Harald Hoyer
harald at fedoraproject.org
Thu Nov 17 10:14:37 UTC 2011
commit 9717706797d74fb4990635e63137ada626895e2c
Author: Harald Hoyer <harald at redhat.com>
Date: Thu Nov 17 11:06:35 2011 +0100
dracut 013-19
- fixed mdraid handling
Resolves: rhbz#751667
- fix cdrom polling
- support opening crypto devs with file
support install_items in dracut.conf
Resolves: rhbz#751640
- include usb storage drivers
Resolves: rhbz#716799
...live-dmsquash-live-root-include-fs_lib.sh.patch | 2 +-
...002-fix-live-crash-with-livenet-installed.patch | 2 +-
...tions-s-emergency-shutdown-shutdown-emerg.patch | 2 +-
...> 0004-dracut-functions-speed-up-inst_dir.patch | 2 +-
...tions-new-function-inst_any-d-dest-f1-f2-.patch | 2 +-
...ctions-fix-inst_dir-for-non-absolute-dirs.patch | 2 +-
...-md-incremental-imsm.rules-incremental-ru.patch | 2 +-
...ild-initramfs-unclear-_mpargs-in-instmods.patch | 2 +-
...-save-and-restore-environment-given-from-.patch | 6 +-
...tions-hmac-checksum-files-can-be-symlinks.patch | 2 +-
...d.patch => 0011-95udev-rules-add-input_id.patch | 2 +-
...nst_simple-inst_dir-make-fast-case-faster.patch | 2 +-
...el_modules-is-a-specialized-filter_kernel.patch | 2 +-
...nstall_kmod_with_fw-make-fast-case-faster.patch | 2 +-
...et-filenames-from-stdin-if-no-args-use-it.patch | 2 +-
...patch => 0016-instmods-sanity-for-_mpargs.patch | 2 +-
...ctor-out-egrep-of-FATAL-Module-.-not-foun.patch | 2 +-
...-do-not-fail-when-importing-the-original-.patch | 6 +-
...parse.patch => 0019-dracut-cp-with-sparse.patch | 6 +-
...ve-root-use-blkid-to-determine-fstype-of-.patch | 2 +-
...ve-root-load-filesystem-modules-before-mo.patch | 2 +-
...9base-init-remove-dev-root-helper-symlink.patch | 24 +++
...o-not-use-run-udev-rules.d-for-udev-rules.patch | 6 +-
...-mount-securityfs-with-source-securityfs-.patch | 4 +-
...nt-securityfs-in-a-seperate-dracut-module.patch | 4 +-
...nt-securityfs-in-a-seperate-dracut-module.patch | 4 +-
...27-90mdraid-adjust-stock-mdadm-udev-rules.patch | 2 +-
...0028-90mdraid-containers-are-not-runnable.patch | 2 +-
...> 0029-90mdraid-fix-adjust-mdraid-cleanup.patch | 2 +-
...0030-90mdraid-fix-adjust-force-run-script.patch | 36 ++--
...031-90-md-dm-raid-recognize-ddf-container.patch | 4 +-
...ix-adjust-65-md-rules-and-related-scripts.patch | 31 ++--
...-relaxed-check-on-ext3-filesystem-options.patch | 2 +-
...s-lib.sh-fsck-btrfs-via-mounting-like-xfs.patch | 2 +-
...tions-inst_rules-do-not-check-std-dirs-fo.patch | 2 +-
...replace-fix.patch => 0036-str_replace-fix.patch | 2 +-
...er-bail-out-early-if-we-don-t-have-to-log.patch | 2 +-
...dracut-create-dev-besides-proc-sys-and-so.patch | 6 +-
...fs-lib-export-FSTAB_FILE-before-fsck-call.patch | 2 +-
...9base-init-remove-dev-root-helper-symlink.patch | 16 --
...0-dracut-functions-inst_rules-add-missing.patch | 2 +-
...d-check-precisely-for-supported-contaiers.patch | 2 +-
...draid-more-thorough-64-md-raid.rules-edit.patch | 2 +-
...atch => 0043-90mdraid-adjust-dev-md-loops.patch | 2 +-
...H-Parameter-expansion-occurs-before-comma.patch | 2 +-
...45-order-mdadm-and-lvm-timeout-operations.patch | 2 +-
...raid-mdraid_start.sh-fix-path-to-md-sysfs.patch | 2 +-
...draid-module-setup.sh-fixed-sed-arguments.patch | 2 +-
...xups.patch => 0048-convert_abs_rel-fixups.patch | 2 +-
...unctions-conv-normalize-minor-corrections.patch | 2 +-
...lib.sh-fix-dropped-backslashes-in-CMDLINE.patch | 2 +-
...et.patch => 0051-90livenet-check-for-wget.patch | 4 +-
...ch => 0052-dracut-logger-re-set-debugging.patch | 2 +-
...nctions-inst_dir-handle-relative-symlinks.patch | 4 +-
...et-module-setup.sh-silence-check-for-wget.patch | 4 +-
... 0055-90livenet-do-not-install-by-default.patch | 4 +-
...tions-do-not-install-files-from-current-d.patch | 4 +-
...nst_script-should-call-inst_simple-750603.patch | 5 +-
...cut.spec-fixed-rhel-fedora-version-checks.patch | 111 +++++++++++
0059-dracut.spec-apply-patches-with-git.patch | 88 +++++++++
...kefile-git2spec.pl-use-temporary-builddir.patch | 61 ++++++
...dules-module-setup.sh-include-usb-mass-st.patch | 30 +++
0062-90mdraid-remove-mdadm_auto.sh-completly.patch | 46 +++++
...sk.sh-use-key-file-if-specified-in-cryptt.patch | 70 +++++++
...draid-wait-for-md-devices-to-become-clean.patch | 56 ++++++
...-only-poll-cdroms-if-the-kernel-does-supp.patch | 63 ++++++
...ase-init-removed-cdrom-polling-reset-code.patch | 29 +++
...base-init-fix-check-for-in-kernel-polling.patch | 22 ++
0068-dracut-add-install_items-to-dracut.conf.patch | 67 +++++++
0069-git2spec.pl-strip-path-from-patches.patch | 21 ++
dracut.spec | 205 ++++++++-----------
71 files changed, 878 insertions(+), 247 deletions(-)
---
diff --git a/0002-90dmsquash-live-dmsquash-live-root-include-fs_lib.sh.patch b/0001-90dmsquash-live-dmsquash-live-root-include-fs_lib.sh.patch
similarity index 92%
rename from 0002-90dmsquash-live-dmsquash-live-root-include-fs_lib.sh.patch
rename to 0001-90dmsquash-live-dmsquash-live-root-include-fs_lib.sh.patch
index dc5edc0..690bd67 100644
--- a/0002-90dmsquash-live-dmsquash-live-root-include-fs_lib.sh.patch
+++ b/0001-90dmsquash-live-dmsquash-live-root-include-fs_lib.sh.patch
@@ -1,4 +1,4 @@
-From 566dab2ac1323df9d21b4d682312f787b10a4bdc Mon Sep 17 00:00:00 2001
+From 167117d5151d99133d92ce0ee28078a73a960a23 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Wed, 17 Aug 2011 08:24:30 +0200
Subject: [PATCH] 90dmsquash-live/dmsquash-live-root: include fs_lib.sh for
diff --git a/0003-fix-live-crash-with-livenet-installed.patch b/0002-fix-live-crash-with-livenet-installed.patch
similarity index 92%
rename from 0003-fix-live-crash-with-livenet-installed.patch
rename to 0002-fix-live-crash-with-livenet-installed.patch
index 4c28383..8f18c2b 100644
--- a/0003-fix-live-crash-with-livenet-installed.patch
+++ b/0002-fix-live-crash-with-livenet-installed.patch
@@ -1,4 +1,4 @@
-From fb216d1a7cc981a50e4cae9179a88406663dda4e Mon Sep 17 00:00:00 2001
+From b0e2b00e815e479ea6470170d066b2883e02f529 Mon Sep 17 00:00:00 2001
From: Will Woods <wwoods at redhat.com>
Date: Mon, 15 Aug 2011 11:10:59 -0400
Subject: [PATCH] fix live crash with livenet installed
diff --git a/0006-dracut-functions-s-emergency-shutdown-shutdown-emerg.patch b/0003-dracut-functions-s-emergency-shutdown-shutdown-emerg.patch
similarity index 91%
rename from 0006-dracut-functions-s-emergency-shutdown-shutdown-emerg.patch
rename to 0003-dracut-functions-s-emergency-shutdown-shutdown-emerg.patch
index 9031e67..34160c7 100644
--- a/0006-dracut-functions-s-emergency-shutdown-shutdown-emerg.patch
+++ b/0003-dracut-functions-s-emergency-shutdown-shutdown-emerg.patch
@@ -1,4 +1,4 @@
-From d670e21998f8b13c6b266e29bcc80db55d19f8c8 Mon Sep 17 00:00:00 2001
+From fb2d4ab69a7978157a3851330271ee3e6174ba28 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Wed, 17 Aug 2011 17:40:59 +0200
Subject: [PATCH] dracut-functions: s/emergency-shutdown/shutdown-emergency/g
diff --git a/0009-dracut-functions-speed-up-inst_dir.patch b/0004-dracut-functions-speed-up-inst_dir.patch
similarity index 94%
rename from 0009-dracut-functions-speed-up-inst_dir.patch
rename to 0004-dracut-functions-speed-up-inst_dir.patch
index 4105200..7d00af0 100644
--- a/0009-dracut-functions-speed-up-inst_dir.patch
+++ b/0004-dracut-functions-speed-up-inst_dir.patch
@@ -1,4 +1,4 @@
-From a76dc2780143a4b04eb33a6699ec2ca7a7898b65 Mon Sep 17 00:00:00 2001
+From 431d013c8661adbd436d59acb99b9016dc08db17 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Fri, 19 Aug 2011 10:24:49 +0200
Subject: [PATCH] dracut-functions: speed up inst_dir()
diff --git a/0012-dracut-functions-new-function-inst_any-d-dest-f1-f2-.patch b/0005-dracut-functions-new-function-inst_any-d-dest-f1-f2-.patch
similarity index 95%
rename from 0012-dracut-functions-new-function-inst_any-d-dest-f1-f2-.patch
rename to 0005-dracut-functions-new-function-inst_any-d-dest-f1-f2-.patch
index a9558a5..bc3e2e1 100644
--- a/0012-dracut-functions-new-function-inst_any-d-dest-f1-f2-.patch
+++ b/0005-dracut-functions-new-function-inst_any-d-dest-f1-f2-.patch
@@ -1,4 +1,4 @@
-From 3378a54f15016c86e4c8c2ecafcaa45f0119fc00 Mon Sep 17 00:00:00 2001
+From 5eb637d09d390973b413c5282066e7f9880684f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe at aidecoe.name>
Date: Sun, 21 Aug 2011 12:47:13 +0200
Subject: [PATCH] dracut-functions: new function: inst_any [-d dest] f1 [f2
diff --git a/0017-dracut-functions-fix-inst_dir-for-non-absolute-dirs.patch b/0006-dracut-functions-fix-inst_dir-for-non-absolute-dirs.patch
similarity index 91%
rename from 0017-dracut-functions-fix-inst_dir-for-non-absolute-dirs.patch
rename to 0006-dracut-functions-fix-inst_dir-for-non-absolute-dirs.patch
index 5c8fabc..761ef05 100644
--- a/0017-dracut-functions-fix-inst_dir-for-non-absolute-dirs.patch
+++ b/0006-dracut-functions-fix-inst_dir-for-non-absolute-dirs.patch
@@ -1,4 +1,4 @@
-From 8cf621ffd98984f44e2861969d9ed58be7233d4e Mon Sep 17 00:00:00 2001
+From e35fe5813d4e397ad6590857907d4c52e598a755 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Tue, 23 Aug 2011 12:50:03 +0200
Subject: [PATCH] dracut-functions: fix inst_dir() for non-absolute dirs
diff --git a/0018-90mdraid-65-md-incremental-imsm.rules-incremental-ru.patch b/0007-90mdraid-65-md-incremental-imsm.rules-incremental-ru.patch
similarity index 93%
rename from 0018-90mdraid-65-md-incremental-imsm.rules-incremental-ru.patch
rename to 0007-90mdraid-65-md-incremental-imsm.rules-incremental-ru.patch
index 66d1aa3..3ec5221 100644
--- a/0018-90mdraid-65-md-incremental-imsm.rules-incremental-ru.patch
+++ b/0007-90mdraid-65-md-incremental-imsm.rules-incremental-ru.patch
@@ -1,4 +1,4 @@
-From 1073b9f93acb76993b4cc41b896325d1041841d1 Mon Sep 17 00:00:00 2001
+From b743eb8e7396bdfea8060e6aa909fb1ce34b7014 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Wed, 24 Aug 2011 16:35:33 +0200
Subject: [PATCH] 90mdraid/65-md-incremental-imsm.rules: incremental run to
diff --git a/0022-build-initramfs-unclear-_mpargs-in-instmods.patch b/0008-build-initramfs-unclear-_mpargs-in-instmods.patch
similarity index 96%
rename from 0022-build-initramfs-unclear-_mpargs-in-instmods.patch
rename to 0008-build-initramfs-unclear-_mpargs-in-instmods.patch
index b8fe96b..1f7ed25 100644
--- a/0022-build-initramfs-unclear-_mpargs-in-instmods.patch
+++ b/0008-build-initramfs-unclear-_mpargs-in-instmods.patch
@@ -1,4 +1,4 @@
-From f4ca564ba67d5821b756727689664604e76d1cdf Mon Sep 17 00:00:00 2001
+From f0d10666ad012565455b5822019be56419d8bbbc Mon Sep 17 00:00:00 2001
From: John Reiser <jreiser at bitwagon.com>
Date: Mon, 29 Aug 2011 14:42:15 -0700
Subject: [PATCH] build initramfs: unclear _mpargs in instmods()
diff --git a/0024-99base-init-save-and-restore-environment-given-from-.patch b/0009-99base-init-save-and-restore-environment-given-from-.patch
similarity index 82%
rename from 0024-99base-init-save-and-restore-environment-given-from-.patch
rename to 0009-99base-init-save-and-restore-environment-given-from-.patch
index e47973f..5f279e9 100644
--- a/0024-99base-init-save-and-restore-environment-given-from-.patch
+++ b/0009-99base-init-save-and-restore-environment-given-from-.patch
@@ -1,4 +1,4 @@
-From ed42e64cfc2c3d36436ef0d0634332219dcce1a2 Mon Sep 17 00:00:00 2001
+From 791b2680d555ffa822e995423a90a38b7050b051 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Tue, 30 Aug 2011 16:22:46 +0200
Subject: [PATCH] 99base/init: save and restore environment given from the
@@ -9,7 +9,7 @@ Subject: [PATCH] 99base/init: save and restore environment given from the
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/modules.d/99base/init b/modules.d/99base/init
-index 0328903..21b9468 100755
+index 90128c7..4a91e53 100755
--- a/modules.d/99base/init
+++ b/modules.d/99base/init
@@ -8,6 +8,8 @@
@@ -21,7 +21,7 @@ index 0328903..21b9468 100755
wait_for_loginit()
{
set +x
-@@ -391,6 +393,8 @@ for i in $(export -p); do
+@@ -395,6 +397,8 @@ for i in $(export -p); do
unset "$i";;
esac
done
diff --git a/0026-dracut-functions-hmac-checksum-files-can-be-symlinks.patch b/0010-dracut-functions-hmac-checksum-files-can-be-symlinks.patch
similarity index 95%
rename from 0026-dracut-functions-hmac-checksum-files-can-be-symlinks.patch
rename to 0010-dracut-functions-hmac-checksum-files-can-be-symlinks.patch
index e510641..05ecd14 100644
--- a/0026-dracut-functions-hmac-checksum-files-can-be-symlinks.patch
+++ b/0010-dracut-functions-hmac-checksum-files-can-be-symlinks.patch
@@ -1,4 +1,4 @@
-From 5f06f0c36701a3e3eb1c6e92ec173285dca3c922 Mon Sep 17 00:00:00 2001
+From 09fa2706c507b0cfad6c5d5f13f5e9e606f33557 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Wed, 31 Aug 2011 15:22:09 +0200
Subject: [PATCH] dracut-functions: hmac checksum files can be symlinks, too
diff --git a/0027-95udev-rules-add-input_id.patch b/0011-95udev-rules-add-input_id.patch
similarity index 90%
rename from 0027-95udev-rules-add-input_id.patch
rename to 0011-95udev-rules-add-input_id.patch
index 6dd28d9..1453d07 100644
--- a/0027-95udev-rules-add-input_id.patch
+++ b/0011-95udev-rules-add-input_id.patch
@@ -1,4 +1,4 @@
-From f063d0e89fdededa1cf0a0f5ab62e05dfb00b2a7 Mon Sep 17 00:00:00 2001
+From d4e0d870eaea9ec48b7a98a7ec64fb070c5f6862 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Wed, 31 Aug 2011 16:48:20 +0200
Subject: [PATCH] 95udev-rules: add input_id
diff --git a/0028-inst_simple-inst_dir-make-fast-case-faster.patch b/0012-inst_simple-inst_dir-make-fast-case-faster.patch
similarity index 96%
rename from 0028-inst_simple-inst_dir-make-fast-case-faster.patch
rename to 0012-inst_simple-inst_dir-make-fast-case-faster.patch
index c111f84..ec7f904 100644
--- a/0028-inst_simple-inst_dir-make-fast-case-faster.patch
+++ b/0012-inst_simple-inst_dir-make-fast-case-faster.patch
@@ -1,4 +1,4 @@
-From 3f590c7840bb0897154f66a277be6bfaa63677bd Mon Sep 17 00:00:00 2001
+From 9f4418b2708c0389a1590adfb39c047094ef01a4 Mon Sep 17 00:00:00 2001
From: John Reiser <jreiser at BitWagon.com>
Date: Fri, 26 Aug 2011 13:01:33 -0700
Subject: [PATCH] inst_simple, inst_dir: make fast case faster
diff --git a/0029-filter_kernel_modules-is-a-specialized-filter_kernel.patch b/0013-filter_kernel_modules-is-a-specialized-filter_kernel.patch
similarity index 96%
rename from 0029-filter_kernel_modules-is-a-specialized-filter_kernel.patch
rename to 0013-filter_kernel_modules-is-a-specialized-filter_kernel.patch
index 2816110..9ab18bb 100644
--- a/0029-filter_kernel_modules-is-a-specialized-filter_kernel.patch
+++ b/0013-filter_kernel_modules-is-a-specialized-filter_kernel.patch
@@ -1,4 +1,4 @@
-From ceebd9ac769dcb869529d57fdb155cf7199251f8 Mon Sep 17 00:00:00 2001
+From 5c237ae50096565a601fd6196a573fdfabdb28ae Mon Sep 17 00:00:00 2001
From: John Reiser <jreiser at BitWagon.com>
Date: Sat, 27 Aug 2011 14:43:49 -0700
Subject: [PATCH] filter_kernel_modules is a specialized
diff --git a/0030-install_kmod_with_fw-make-fast-case-faster.patch b/0014-install_kmod_with_fw-make-fast-case-faster.patch
similarity index 94%
rename from 0030-install_kmod_with_fw-make-fast-case-faster.patch
rename to 0014-install_kmod_with_fw-make-fast-case-faster.patch
index 892bf70..3edc4b5 100644
--- a/0030-install_kmod_with_fw-make-fast-case-faster.patch
+++ b/0014-install_kmod_with_fw-make-fast-case-faster.patch
@@ -1,4 +1,4 @@
-From e6024e0030bcf35b0f0c97cdc6f259711536459b Mon Sep 17 00:00:00 2001
+From d177fc36aa64c5845a26931f0a4d0ece8d160088 Mon Sep 17 00:00:00 2001
From: John Reiser <jreiser at BitWagon.com>
Date: Sun, 28 Aug 2011 13:24:58 -0700
Subject: [PATCH] install_kmod_with_fw: make fast case faster
diff --git a/0031-instmods-get-filenames-from-stdin-if-no-args-use-it.patch b/0015-instmods-get-filenames-from-stdin-if-no-args-use-it.patch
similarity index 99%
rename from 0031-instmods-get-filenames-from-stdin-if-no-args-use-it.patch
rename to 0015-instmods-get-filenames-from-stdin-if-no-args-use-it.patch
index c3781e6..cb2cce2 100644
--- a/0031-instmods-get-filenames-from-stdin-if-no-args-use-it.patch
+++ b/0015-instmods-get-filenames-from-stdin-if-no-args-use-it.patch
@@ -1,4 +1,4 @@
-From 881eda695ed552474b9d1e5befe084d7bfab3d50 Mon Sep 17 00:00:00 2001
+From 651fc4e20e3c611b3ba465e76b53b9b2d796b2d0 Mon Sep 17 00:00:00 2001
From: John Reiser <jreiser at BitWagon.com>
Date: Mon, 29 Aug 2011 13:40:21 -0700
Subject: [PATCH] instmods: get filenames from stdin if no args; use it
diff --git a/0032-instmods-sanity-for-_mpargs.patch b/0016-instmods-sanity-for-_mpargs.patch
similarity index 96%
rename from 0032-instmods-sanity-for-_mpargs.patch
rename to 0016-instmods-sanity-for-_mpargs.patch
index cda1227..b9b8a9c 100644
--- a/0032-instmods-sanity-for-_mpargs.patch
+++ b/0016-instmods-sanity-for-_mpargs.patch
@@ -1,4 +1,4 @@
-From 0024702fe7551e0de8180a5b514b31f57b4fc213 Mon Sep 17 00:00:00 2001
+From c3ff7f0fd3c8a9b067c55fcee4bdab7e1118ecbf Mon Sep 17 00:00:00 2001
From: John Reiser <jreiser at BitWagon.com>
Date: Mon, 29 Aug 2011 14:46:25 -0700
Subject: [PATCH] instmods: sanity for _mpargs
diff --git a/0033-instmods-factor-out-egrep-of-FATAL-Module-.-not-foun.patch b/0017-instmods-factor-out-egrep-of-FATAL-Module-.-not-foun.patch
similarity index 97%
rename from 0033-instmods-factor-out-egrep-of-FATAL-Module-.-not-foun.patch
rename to 0017-instmods-factor-out-egrep-of-FATAL-Module-.-not-foun.patch
index 647c8e4..1c84a77 100644
--- a/0033-instmods-factor-out-egrep-of-FATAL-Module-.-not-foun.patch
+++ b/0017-instmods-factor-out-egrep-of-FATAL-Module-.-not-foun.patch
@@ -1,4 +1,4 @@
-From f9708da22345aa11bfa0d5514eefef11f542526b Mon Sep 17 00:00:00 2001
+From 59086d28aa330c8a62804eee46a8221afc1c5fa9 Mon Sep 17 00:00:00 2001
From: John Reiser <jreiser at BitWagon.com>
Date: Mon, 29 Aug 2011 16:03:35 -0700
Subject: [PATCH] instmods: factor out egrep of "FATAL: Module .* not found"
diff --git a/0034-99base-init-do-not-fail-when-importing-the-original-.patch b/0018-99base-init-do-not-fail-when-importing-the-original-.patch
similarity index 78%
rename from 0034-99base-init-do-not-fail-when-importing-the-original-.patch
rename to 0018-99base-init-do-not-fail-when-importing-the-original-.patch
index a070768..56515ac 100644
--- a/0034-99base-init-do-not-fail-when-importing-the-original-.patch
+++ b/0018-99base-init-do-not-fail-when-importing-the-original-.patch
@@ -1,4 +1,4 @@
-From dffb93feaf6c179dbe4f854f1266fbe8529dbea9 Mon Sep 17 00:00:00 2001
+From a465046b3d6a6073eff2d6516608635f70d59f68 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Thu, 1 Sep 2011 16:01:21 +0200
Subject: [PATCH] 99base/init: do not fail, when importing the original kernel
@@ -9,10 +9,10 @@ Subject: [PATCH] 99base/init: do not fail, when importing the original kernel
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/modules.d/99base/init b/modules.d/99base/init
-index b666d3e..4cbe342 100755
+index 4a91e53..30a5cf9 100755
--- a/modules.d/99base/init
+++ b/modules.d/99base/init
-@@ -392,7 +392,7 @@ for i in $(export -p); do
+@@ -397,7 +397,7 @@ for i in $(export -p); do
unset "$i";;
esac
done
diff --git a/0035-dracut-cp-with-sparse.patch b/0019-dracut-cp-with-sparse.patch
similarity index 86%
rename from 0035-dracut-cp-with-sparse.patch
rename to 0019-dracut-cp-with-sparse.patch
index 022a6df..23865cb 100644
--- a/0035-dracut-cp-with-sparse.patch
+++ b/0019-dracut-cp-with-sparse.patch
@@ -1,4 +1,4 @@
-From 59f288ce631a7793755d16ee26fef0355098d33a Mon Sep 17 00:00:00 2001
+From 86e9b93990abe5badc3ea27a38dc62977911c377 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Fri, 2 Sep 2011 09:01:47 +0200
Subject: [PATCH] dracut: cp with sparse
@@ -9,10 +9,10 @@ Subject: [PATCH] dracut: cp with sparse
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dracut b/dracut
-index fd36805..0e930c7 100755
+index cf27b23..6ecb19a 100755
--- a/dracut
+++ b/dracut
-@@ -650,7 +650,7 @@ if strstr "$modules_loaded" " fips " && command -v prelink >/dev/null; then
+@@ -649,7 +649,7 @@ if strstr "$modules_loaded" " fips " && command -v prelink >/dev/null; then
done
fi
diff --git a/0037-dmsquash-live-root-use-blkid-to-determine-fstype-of-.patch b/0020-dmsquash-live-root-use-blkid-to-determine-fstype-of-.patch
similarity index 93%
rename from 0037-dmsquash-live-root-use-blkid-to-determine-fstype-of-.patch
rename to 0020-dmsquash-live-root-use-blkid-to-determine-fstype-of-.patch
index 76bc6c4..0b5c9e6 100644
--- a/0037-dmsquash-live-root-use-blkid-to-determine-fstype-of-.patch
+++ b/0020-dmsquash-live-root-use-blkid-to-determine-fstype-of-.patch
@@ -1,4 +1,4 @@
-From bfafdf4222a221323f7d24dd4024ea2b6c4c2afe Mon Sep 17 00:00:00 2001
+From f435070d7141a7e0e0a46a712108e962b12c73f6 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Fri, 2 Sep 2011 19:01:16 +0200
Subject: [PATCH] dmsquash-live-root: use blkid to determine fstype of images
diff --git a/0038-dmsquash-live-root-load-filesystem-modules-before-mo.patch b/0021-dmsquash-live-root-load-filesystem-modules-before-mo.patch
similarity index 95%
rename from 0038-dmsquash-live-root-load-filesystem-modules-before-mo.patch
rename to 0021-dmsquash-live-root-load-filesystem-modules-before-mo.patch
index cdbdb0f..207e18f 100644
--- a/0038-dmsquash-live-root-load-filesystem-modules-before-mo.patch
+++ b/0021-dmsquash-live-root-load-filesystem-modules-before-mo.patch
@@ -1,4 +1,4 @@
-From 951c9505ea72fd470a0344e14f6454a61b632b6b Mon Sep 17 00:00:00 2001
+From effffcc379b14a46334f0d46b37720ee9cd0507e Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Fri, 2 Sep 2011 19:16:17 +0200
Subject: [PATCH] dmsquash-live-root: load filesystem modules before mounting
diff --git a/0022-99base-init-remove-dev-root-helper-symlink.patch b/0022-99base-init-remove-dev-root-helper-symlink.patch
new file mode 100644
index 0000000..b875771
--- /dev/null
+++ b/0022-99base-init-remove-dev-root-helper-symlink.patch
@@ -0,0 +1,24 @@
+From 6102e8968641c92988b5e9db17f004c19c5b9484 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Mon, 19 Sep 2011 12:20:55 +0200
+Subject: [PATCH] 99base/init: remove /dev/root helper symlink
+
+Any tool relying on /dev/root has to be fixed.
+---
+ modules.d/99base/init | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/modules.d/99base/init b/modules.d/99base/init
+index 30a5cf9..a759c44 100755
+--- a/modules.d/99base/init
++++ b/modules.d/99base/init
+@@ -447,6 +447,9 @@ fi
+
+ wait_for_loginit
+
++# remove helper symlink
++[ -h /dev/root ] && rm -f /dev/root
++
+ info "Switching root"
+
+ unset PS4
diff --git a/0041-Do-not-use-run-udev-rules.d-for-udev-rules.patch b/0023-Do-not-use-run-udev-rules.d-for-udev-rules.patch
similarity index 94%
rename from 0041-Do-not-use-run-udev-rules.d-for-udev-rules.patch
rename to 0023-Do-not-use-run-udev-rules.d-for-udev-rules.patch
index e975b5a..1ed61fb 100644
--- a/0041-Do-not-use-run-udev-rules.d-for-udev-rules.patch
+++ b/0023-Do-not-use-run-udev-rules.d-for-udev-rules.patch
@@ -1,4 +1,4 @@
-From ca8d4e8933e6124c2a0cf0e37f0296b80976ab33 Mon Sep 17 00:00:00 2001
+From efe69a861c88795270f2f0914b9aa0dad61dc214 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Mon, 19 Sep 2011 12:21:51 +0200
Subject: [PATCH] Do not use /run/udev/rules.d for udev rules
@@ -14,10 +14,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=734096
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules.d/90dmsquash-live/dmsquash-live-genrules.sh b/modules.d/90dmsquash-live/dmsquash-live-genrules.sh
-index d6d0aa3..aa0654b 100755
+index ce1ca82..06a9e74 100755
--- a/modules.d/90dmsquash-live/dmsquash-live-genrules.sh
+++ b/modules.d/90dmsquash-live/dmsquash-live-genrules.sh
-@@ -8,7 +8,7 @@ case "$root" in
+@@ -14,7 +14,7 @@ case "$root" in
${root#live:/dev/}
printf 'SYMLINK=="%s", RUN+="/sbin/initqueue --settled --onetime --unique /sbin/dmsquash-live-root $env{DEVNAME}"\n' \
${root#live:/dev/}
diff --git a/0042-99base-init-mount-securityfs-with-source-securityfs-.patch b/0024-99base-init-mount-securityfs-with-source-securityfs-.patch
similarity index 88%
rename from 0042-99base-init-mount-securityfs-with-source-securityfs-.patch
rename to 0024-99base-init-mount-securityfs-with-source-securityfs-.patch
index 6b2d9a8..0fb1e74 100644
--- a/0042-99base-init-mount-securityfs-with-source-securityfs-.patch
+++ b/0024-99base-init-mount-securityfs-with-source-securityfs-.patch
@@ -1,4 +1,4 @@
-From d63fdc1198cd13ed68e7f08acd7ca164c9f35262 Mon Sep 17 00:00:00 2001
+From 6f419342f9cfed2978c0818a9dce1188775fff46 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Tue, 20 Sep 2011 10:10:29 +0200
Subject: [PATCH] 99base/init: mount securityfs with source "securityfs"
@@ -9,7 +9,7 @@ Subject: [PATCH] 99base/init: mount securityfs with source "securityfs"
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/modules.d/99base/init b/modules.d/99base/init
-index 4f59818..fa808ca 100755
+index a759c44..680a785 100755
--- a/modules.d/99base/init
+++ b/modules.d/99base/init
@@ -89,7 +89,7 @@ RD_DEBUG=""
diff --git a/0043-mount-securityfs-in-a-seperate-dracut-module.patch b/0025-mount-securityfs-in-a-seperate-dracut-module.patch
similarity index 96%
rename from 0043-mount-securityfs-in-a-seperate-dracut-module.patch
rename to 0025-mount-securityfs-in-a-seperate-dracut-module.patch
index 7e5bd72..a2169f2 100644
--- a/0043-mount-securityfs-in-a-seperate-dracut-module.patch
+++ b/0025-mount-securityfs-in-a-seperate-dracut-module.patch
@@ -1,4 +1,4 @@
-From 16457c869d3fac6a94e204f1edac1ad9fffae55a Mon Sep 17 00:00:00 2001
+From ba8882487d32cf4c7c876bb31ea51a5360b4a918 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Tue, 20 Sep 2011 11:16:53 +0200
Subject: [PATCH] mount securityfs in a seperate dracut module
@@ -63,7 +63,7 @@ index cab9027..7d5771c 100755
}
diff --git a/modules.d/99base/init b/modules.d/99base/init
-index fa808ca..06d61a8 100755
+index 680a785..b61680a 100755
--- a/modules.d/99base/init
+++ b/modules.d/99base/init
@@ -86,12 +86,6 @@ RD_DEBUG=""
diff --git a/0044-mount-securityfs-in-a-seperate-dracut-module.patch b/0026-mount-securityfs-in-a-seperate-dracut-module.patch
similarity index 87%
rename from 0044-mount-securityfs-in-a-seperate-dracut-module.patch
rename to 0026-mount-securityfs-in-a-seperate-dracut-module.patch
index c029c3c..78d3e4b 100644
--- a/0044-mount-securityfs-in-a-seperate-dracut-module.patch
+++ b/0026-mount-securityfs-in-a-seperate-dracut-module.patch
@@ -1,4 +1,4 @@
-From 6d385c7111c81fe730c1823b232d19e8d42f50d4 Mon Sep 17 00:00:00 2001
+From 9d47e57843d94d2ae20b7de5a60ccdb564bf0b85 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Tue, 20 Sep 2011 11:16:53 +0200
Subject: [PATCH] mount securityfs in a seperate dracut module
@@ -8,7 +8,7 @@ Subject: [PATCH] mount securityfs in a seperate dracut module
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/dracut.spec b/dracut.spec
-index 76f4fe1..f9848ed 100644
+index 4a71942..ff004c3 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -247,6 +247,7 @@ rm -rf $RPM_BUILD_ROOT
diff --git a/0045-90mdraid-adjust-stock-mdadm-udev-rules.patch b/0027-90mdraid-adjust-stock-mdadm-udev-rules.patch
similarity index 95%
rename from 0045-90mdraid-adjust-stock-mdadm-udev-rules.patch
rename to 0027-90mdraid-adjust-stock-mdadm-udev-rules.patch
index e71a173..482d821 100644
--- a/0045-90mdraid-adjust-stock-mdadm-udev-rules.patch
+++ b/0027-90mdraid-adjust-stock-mdadm-udev-rules.patch
@@ -1,4 +1,4 @@
-From e3e5128cf20660c0789f9b4e2285dbc1f35f6799 Mon Sep 17 00:00:00 2001
+From 3a9fc917473eaadf07778cc8404d6338f745c3b0 Mon Sep 17 00:00:00 2001
From: Michal Soltys <soltys at ziu.info>
Date: Tue, 6 Sep 2011 00:17:23 +0200
Subject: [PATCH] 90mdraid: adjust stock mdadm udev rules
diff --git a/0046-90mdraid-containers-are-not-runnable.patch b/0028-90mdraid-containers-are-not-runnable.patch
similarity index 98%
rename from 0046-90mdraid-containers-are-not-runnable.patch
rename to 0028-90mdraid-containers-are-not-runnable.patch
index e75e476..fd2b3f5 100644
--- a/0046-90mdraid-containers-are-not-runnable.patch
+++ b/0028-90mdraid-containers-are-not-runnable.patch
@@ -1,4 +1,4 @@
-From 5f6a71b38af7550d11c790abd5ca0bd0cf7b7f05 Mon Sep 17 00:00:00 2001
+From 63d73999ea80072134463510172404a0f55bb4b9 Mon Sep 17 00:00:00 2001
From: Michal Soltys <soltys at ziu.info>
Date: Tue, 6 Sep 2011 00:17:25 +0200
Subject: [PATCH] 90mdraid: containers are not runnable
diff --git a/0047-90mdraid-fix-adjust-mdraid-cleanup.patch b/0029-90mdraid-fix-adjust-mdraid-cleanup.patch
similarity index 97%
rename from 0047-90mdraid-fix-adjust-mdraid-cleanup.patch
rename to 0029-90mdraid-fix-adjust-mdraid-cleanup.patch
index 926fcb8..99459c8 100644
--- a/0047-90mdraid-fix-adjust-mdraid-cleanup.patch
+++ b/0029-90mdraid-fix-adjust-mdraid-cleanup.patch
@@ -1,4 +1,4 @@
-From 9383421c1cfc5fe1bc94cf3d3194bd96ee503628 Mon Sep 17 00:00:00 2001
+From a2a8eddf0ffd010c6a14b391db36c6313e37dbfd Mon Sep 17 00:00:00 2001
From: Michal Soltys <soltys at ziu.info>
Date: Tue, 6 Sep 2011 00:17:26 +0200
Subject: [PATCH] 90mdraid: fix/adjust mdraid-cleanup
diff --git a/0048-90mdraid-fix-adjust-force-run-script.patch b/0030-90mdraid-fix-adjust-force-run-script.patch
similarity index 95%
rename from 0048-90mdraid-fix-adjust-force-run-script.patch
rename to 0030-90mdraid-fix-adjust-force-run-script.patch
index 433ff46..3370f3a 100644
--- a/0048-90mdraid-fix-adjust-force-run-script.patch
+++ b/0030-90mdraid-fix-adjust-force-run-script.patch
@@ -1,4 +1,4 @@
-From 66426469d024b7760f59051af287e11ec6a94c1f Mon Sep 17 00:00:00 2001
+From a28973d671acb2cfc7a26eedee0ad76de30b15a8 Mon Sep 17 00:00:00 2001
From: Michal Soltys <soltys at ziu.info>
Date: Tue, 6 Sep 2011 00:17:27 +0200
Subject: [PATCH] 90mdraid: fix/adjust force-run script
@@ -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 | 51 ++++++++++++++++++++++--------------
+ modules.d/90mdraid/mdraid_start.sh | 47 ++++++++++++++++++++++-------------
modules.d/90mdraid/module-setup.sh | 2 +-
modules.d/90mdraid/parse-md.sh | 1 +
- 3 files changed, 33 insertions(+), 21 deletions(-)
+ 3 files changed, 31 insertions(+), 19 deletions(-)
diff --git a/modules.d/90mdraid/mdraid_start.sh b/modules.d/90mdraid/mdraid_start.sh
index 4c0255e..be5a3ce 100755
@@ -63,7 +63,17 @@ 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
@@ -75,23 +85,11 @@ index 4c0255e..be5a3ce 100755
- mdadm --run "$md" 2>&1 | vinfo
-done
-unset udevinfo
--
--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
-+
+
+-ln -s $(command -v mdraid-cleanup) $hookdir/pre-pivot/31-mdraid-cleanup.sh 2>/dev/null
+-udevadm control --start-exec-queue
+ # inactive ?
+ [ "$(cat "$_path_s")" != "inactive" ] && continue
+
diff --git a/0049-90-md-dm-raid-recognize-ddf-container.patch b/0031-90-md-dm-raid-recognize-ddf-container.patch
similarity index 98%
rename from 0049-90-md-dm-raid-recognize-ddf-container.patch
rename to 0031-90-md-dm-raid-recognize-ddf-container.patch
index a289946..11405ad 100644
--- a/0049-90-md-dm-raid-recognize-ddf-container.patch
+++ b/0031-90-md-dm-raid-recognize-ddf-container.patch
@@ -1,4 +1,4 @@
-From cf5891424ef026eede69606a918dadf5560095fd Mon Sep 17 00:00:00 2001
+From 1f377a6abbffc6da903cfeca84cbebd367e62a9f Mon Sep 17 00:00:00 2001
From: Michal Soltys <soltys at ziu.info>
Date: Tue, 6 Sep 2011 00:17:24 +0200
Subject: [PATCH] 90(md|dm)raid: recognize ddf container
@@ -19,7 +19,7 @@ Signed-off-by: Michal Soltys <soltys at ziu.info>
create mode 100755 modules.d/90mdraid/md-noddf.sh
diff --git a/dracut.kernel.7.xml b/dracut.kernel.7.xml
-index b6e59e6..8d50d94 100644
+index 894b640..2eb86b1 100644
--- a/dracut.kernel.7.xml
+++ b/dracut.kernel.7.xml
@@ -343,6 +343,12 @@ This parameter can be specified multiple times.</para>
diff --git a/0050-90mdraid-fix-adjust-65-md-rules-and-related-scripts.patch b/0032-90mdraid-fix-adjust-65-md-rules-and-related-scripts.patch
similarity index 97%
rename from 0050-90mdraid-fix-adjust-65-md-rules-and-related-scripts.patch
rename to 0032-90mdraid-fix-adjust-65-md-rules-and-related-scripts.patch
index 53b6fe6..ae08daf 100644
--- a/0050-90mdraid-fix-adjust-65-md-rules-and-related-scripts.patch
+++ b/0032-90mdraid-fix-adjust-65-md-rules-and-related-scripts.patch
@@ -1,4 +1,4 @@
-From a025cc17f0d8145492ffbb37735deca208e768bd Mon Sep 17 00:00:00 2001
+From 1159b1cbe61a514dd05c98a919b4362cdbe95219 Mon Sep 17 00:00:00 2001
From: Michal Soltys <soltys at ziu.info>
Date: Tue, 6 Sep 2011 00:17:28 +0200
Subject: [PATCH] 90mdraid: fix/adjust 65-md* rules and related scripts
@@ -30,12 +30,12 @@ the following:
Signed-off-by: Michal Soltys <soltys at ziu.info>
---
- modules.d/90mdraid/65-md-incremental-imsm.rules | 79 ++++++++---------------
+ modules.d/90mdraid/65-md-incremental-imsm.rules | 73 ++++++++---------------
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, 34 insertions(+), 65 deletions(-)
+ 5 files changed, 31 insertions(+), 62 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,27 +49,24 @@ 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 ?
@@ -111,7 +108,8 @@ 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"
-
-#
@@ -124,8 +122,7 @@ 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/0051-TEST-40-NBD-relaxed-check-on-ext3-filesystem-options.patch b/0033-TEST-40-NBD-relaxed-check-on-ext3-filesystem-options.patch
similarity index 96%
rename from 0051-TEST-40-NBD-relaxed-check-on-ext3-filesystem-options.patch
rename to 0033-TEST-40-NBD-relaxed-check-on-ext3-filesystem-options.patch
index facc88f..95d6fea 100644
--- a/0051-TEST-40-NBD-relaxed-check-on-ext3-filesystem-options.patch
+++ b/0033-TEST-40-NBD-relaxed-check-on-ext3-filesystem-options.patch
@@ -1,4 +1,4 @@
-From 75e8f476e7bf33e2759b5a05b9d10f8befc4eedd Mon Sep 17 00:00:00 2001
+From 687ed067207a0dd61d7289b9238f15e302785722 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Thu, 22 Sep 2011 12:56:31 +0200
Subject: [PATCH] TEST-40-NBD: relaxed check on ext3 filesystem options
diff --git a/0052-99fs-lib-fs-lib.sh-fsck-btrfs-via-mounting-like-xfs.patch b/0034-99fs-lib-fs-lib.sh-fsck-btrfs-via-mounting-like-xfs.patch
similarity index 96%
rename from 0052-99fs-lib-fs-lib.sh-fsck-btrfs-via-mounting-like-xfs.patch
rename to 0034-99fs-lib-fs-lib.sh-fsck-btrfs-via-mounting-like-xfs.patch
index edde8bd..2a66b85 100644
--- a/0052-99fs-lib-fs-lib.sh-fsck-btrfs-via-mounting-like-xfs.patch
+++ b/0034-99fs-lib-fs-lib.sh-fsck-btrfs-via-mounting-like-xfs.patch
@@ -1,4 +1,4 @@
-From 662ed0a13f4b497352fe9b6a1d243f06e45c4f3d Mon Sep 17 00:00:00 2001
+From 402bda06d41d2b45526ba2793f369747ecfbc3e3 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Thu, 22 Sep 2011 15:12:14 +0200
Subject: [PATCH] 99fs-lib/fs-lib.sh: fsck btrfs via mounting like xfs
diff --git a/0053-dracut-functions-inst_rules-do-not-check-std-dirs-fo.patch b/0035-dracut-functions-inst_rules-do-not-check-std-dirs-fo.patch
similarity index 94%
rename from 0053-dracut-functions-inst_rules-do-not-check-std-dirs-fo.patch
rename to 0035-dracut-functions-inst_rules-do-not-check-std-dirs-fo.patch
index 99488ea..eb489fc 100644
--- a/0053-dracut-functions-inst_rules-do-not-check-std-dirs-fo.patch
+++ b/0035-dracut-functions-inst_rules-do-not-check-std-dirs-fo.patch
@@ -1,4 +1,4 @@
-From 76f5fa549c483a7a38e4757578480096b94615ac Mon Sep 17 00:00:00 2001
+From 256e0f0822c82a79fd1966e28d75a569a02c19a8 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Thu, 22 Sep 2011 15:43:34 +0200
Subject: [PATCH] dracut-functions: inst_rules() do not check std dirs for abs
diff --git a/0054-str_replace-fix.patch b/0036-str_replace-fix.patch
similarity index 93%
rename from 0054-str_replace-fix.patch
rename to 0036-str_replace-fix.patch
index 60dfc19..2799be6 100644
--- a/0054-str_replace-fix.patch
+++ b/0036-str_replace-fix.patch
@@ -1,4 +1,4 @@
-From cb288154050ff5293bc9a0a72953cd2b93782abb Mon Sep 17 00:00:00 2001
+From 7b50c1039cecc5a8affd7a707e66c722622eff53 Mon Sep 17 00:00:00 2001
From: Michal Soltys <soltys at ziu.info>
Date: Thu, 15 Sep 2011 08:45:57 +0200
Subject: [PATCH] str_replace() fix
diff --git a/0055-dracut-logger-bail-out-early-if-we-don-t-have-to-log.patch b/0037-dracut-logger-bail-out-early-if-we-don-t-have-to-log.patch
similarity index 93%
rename from 0055-dracut-logger-bail-out-early-if-we-don-t-have-to-log.patch
rename to 0037-dracut-logger-bail-out-early-if-we-don-t-have-to-log.patch
index a73d63b..85ce4de 100644
--- a/0055-dracut-logger-bail-out-early-if-we-don-t-have-to-log.patch
+++ b/0037-dracut-logger-bail-out-early-if-we-don-t-have-to-log.patch
@@ -1,4 +1,4 @@
-From 69063507d4c553cb5c4e51fb401d29eda7106351 Mon Sep 17 00:00:00 2001
+From 9360f9ac150d60103c1e0b348657a894cbc45674 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Thu, 22 Sep 2011 15:49:25 +0200
Subject: [PATCH] dracut-logger: bail out early, if we don't have to log
diff --git a/0056-dracut-create-dev-besides-proc-sys-and-so.patch b/0038-dracut-create-dev-besides-proc-sys-and-so.patch
similarity index 81%
rename from 0056-dracut-create-dev-besides-proc-sys-and-so.patch
rename to 0038-dracut-create-dev-besides-proc-sys-and-so.patch
index 6cfc26e..1ab3941 100644
--- a/0056-dracut-create-dev-besides-proc-sys-and-so.patch
+++ b/0038-dracut-create-dev-besides-proc-sys-and-so.patch
@@ -1,4 +1,4 @@
-From 7c14b3688c83b14c95bafb4989871ffac2092c42 Mon Sep 17 00:00:00 2001
+From 33093579cb85de20926bc7dd7bf28a4983545514 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe at aidecoe.name>
Date: Sun, 4 Sep 2011 16:38:35 +0200
Subject: [PATCH] dracut: create /dev besides /proc, /sys and so
@@ -10,10 +10,10 @@ initramfs integrated into kernel.
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/dracut b/dracut
-index 0e930c7..c9329bd 100755
+index 6ecb19a..ddafdef 100755
--- a/dracut
+++ b/dracut
-@@ -510,7 +510,7 @@ if [[ $kernel_only != yes ]]; then
+@@ -509,7 +509,7 @@ if [[ $kernel_only != yes ]]; then
fi
done
diff --git a/0057-99fs-lib-export-FSTAB_FILE-before-fsck-call.patch b/0039-99fs-lib-export-FSTAB_FILE-before-fsck-call.patch
similarity index 91%
rename from 0057-99fs-lib-export-FSTAB_FILE-before-fsck-call.patch
rename to 0039-99fs-lib-export-FSTAB_FILE-before-fsck-call.patch
index b64bbeb..86cf77d 100644
--- a/0057-99fs-lib-export-FSTAB_FILE-before-fsck-call.patch
+++ b/0039-99fs-lib-export-FSTAB_FILE-before-fsck-call.patch
@@ -1,4 +1,4 @@
-From f07aaccd0600cefd113d1393cb4ca6a7e969a8e1 Mon Sep 17 00:00:00 2001
+From 8558be823a7f6adf95a482d65f7ef917e9f32ffd Mon Sep 17 00:00:00 2001
From: Michal Soltys <soltys at ziu.info>
Date: Tue, 6 Sep 2011 01:22:15 +0200
Subject: [PATCH] 99fs-lib: export FSTAB_FILE before fsck call
diff --git a/0058-dracut-functions-inst_rules-add-missing.patch b/0040-dracut-functions-inst_rules-add-missing.patch
similarity index 91%
rename from 0058-dracut-functions-inst_rules-add-missing.patch
rename to 0040-dracut-functions-inst_rules-add-missing.patch
index 022d6fc..088e112 100644
--- a/0058-dracut-functions-inst_rules-add-missing.patch
+++ b/0040-dracut-functions-inst_rules-add-missing.patch
@@ -1,4 +1,4 @@
-From 08769b7f8a9efc57cd95d1f81e8aaf1a48db0d28 Mon Sep 17 00:00:00 2001
+From 224b47d83800fa04f1608f61caeb326a079beba3 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Thu, 22 Sep 2011 16:14:38 +0200
Subject: [PATCH] dracut-functions: inst_rules() add missing ""
diff --git a/0059-90mdraid-check-precisely-for-supported-contaiers.patch b/0041-90mdraid-check-precisely-for-supported-contaiers.patch
similarity index 96%
rename from 0059-90mdraid-check-precisely-for-supported-contaiers.patch
rename to 0041-90mdraid-check-precisely-for-supported-contaiers.patch
index 3faae26..91df6ef 100644
--- a/0059-90mdraid-check-precisely-for-supported-contaiers.patch
+++ b/0041-90mdraid-check-precisely-for-supported-contaiers.patch
@@ -1,4 +1,4 @@
-From db9b9f396e8d923591725f648c0a35789286254b Mon Sep 17 00:00:00 2001
+From e1868471ca995a1a35df84da890637dd51217aa1 Mon Sep 17 00:00:00 2001
From: Michal Soltys <soltys at ziu.info>
Date: Thu, 22 Sep 2011 17:09:56 +0200
Subject: [PATCH] 90mdraid: check precisely for supported contaiers
diff --git a/0060-90mdraid-more-thorough-64-md-raid.rules-edit.patch b/0042-90mdraid-more-thorough-64-md-raid.rules-edit.patch
similarity index 94%
rename from 0060-90mdraid-more-thorough-64-md-raid.rules-edit.patch
rename to 0042-90mdraid-more-thorough-64-md-raid.rules-edit.patch
index e3e2f15..52dd1e6 100644
--- a/0060-90mdraid-more-thorough-64-md-raid.rules-edit.patch
+++ b/0042-90mdraid-more-thorough-64-md-raid.rules-edit.patch
@@ -1,4 +1,4 @@
-From ae816bb6aa461eb561debc9188e69f726b31d805 Mon Sep 17 00:00:00 2001
+From af3b5b4d2e8c7c89a7d21f92eab39d4296395e5d Mon Sep 17 00:00:00 2001
From: Michal Soltys <soltys at ziu.info>
Date: Thu, 22 Sep 2011 17:23:21 +0200
Subject: [PATCH] 90mdraid: more thorough 64-md-raid.rules edit
diff --git a/0061-90mdraid-adjust-dev-md-loops.patch b/0043-90mdraid-adjust-dev-md-loops.patch
similarity index 97%
rename from 0061-90mdraid-adjust-dev-md-loops.patch
rename to 0043-90mdraid-adjust-dev-md-loops.patch
index a38299b..3debb3f 100644
--- a/0061-90mdraid-adjust-dev-md-loops.patch
+++ b/0043-90mdraid-adjust-dev-md-loops.patch
@@ -1,4 +1,4 @@
-From 9fc3f0452023c42c235c3312ad311243e7f900a2 Mon Sep 17 00:00:00 2001
+From 8169cbe9957452ecce6af54b9093b8004009aaf5 Mon Sep 17 00:00:00 2001
From: Michal Soltys <soltys at ziu.info>
Date: Thu, 22 Sep 2011 17:16:39 +0200
Subject: [PATCH] 90mdraid: adjust /dev/md loops
diff --git a/0062-dracut-PATCH-Parameter-expansion-occurs-before-comma.patch b/0044-dracut-PATCH-Parameter-expansion-occurs-before-comma.patch
similarity index 95%
rename from 0062-dracut-PATCH-Parameter-expansion-occurs-before-comma.patch
rename to 0044-dracut-PATCH-Parameter-expansion-occurs-before-comma.patch
index ac62617..0ec884e 100644
--- a/0062-dracut-PATCH-Parameter-expansion-occurs-before-comma.patch
+++ b/0044-dracut-PATCH-Parameter-expansion-occurs-before-comma.patch
@@ -1,4 +1,4 @@
-From 9e103df45e4ca2c2392cedf3c9ecb84713962838 Mon Sep 17 00:00:00 2001
+From ebca46409f5b4b9e5fb6c872b274dbcdcf2b73ff Mon Sep 17 00:00:00 2001
From: John Reiser <jreiser at bitwagon.com>
Date: Fri, 23 Sep 2011 08:02:23 -0700
Subject: [PATCH] dracut [PATCH] Parameter expansion occurs before command
diff --git a/0064-order-mdadm-and-lvm-timeout-operations.patch b/0045-order-mdadm-and-lvm-timeout-operations.patch
similarity index 96%
rename from 0064-order-mdadm-and-lvm-timeout-operations.patch
rename to 0045-order-mdadm-and-lvm-timeout-operations.patch
index 6426bfd..c7d4fe2 100644
--- a/0064-order-mdadm-and-lvm-timeout-operations.patch
+++ b/0045-order-mdadm-and-lvm-timeout-operations.patch
@@ -1,4 +1,4 @@
-From 77a57d5eafc3e46d01b196312d5dd4f28e0e8010 Mon Sep 17 00:00:00 2001
+From 4d4885b67f109fd365f9af5363f16d4f60365b63 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Tue, 4 Oct 2011 13:03:45 +0200
Subject: [PATCH] order mdadm and lvm timeout operations
diff --git a/0065-90mdraid-mdraid_start.sh-fix-path-to-md-sysfs.patch b/0046-90mdraid-mdraid_start.sh-fix-path-to-md-sysfs.patch
similarity index 92%
rename from 0065-90mdraid-mdraid_start.sh-fix-path-to-md-sysfs.patch
rename to 0046-90mdraid-mdraid_start.sh-fix-path-to-md-sysfs.patch
index 35a7ec4..37dbfd0 100644
--- a/0065-90mdraid-mdraid_start.sh-fix-path-to-md-sysfs.patch
+++ b/0046-90mdraid-mdraid_start.sh-fix-path-to-md-sysfs.patch
@@ -1,4 +1,4 @@
-From e0e9221e23f783ce670349df52da46bf6dc05c14 Mon Sep 17 00:00:00 2001
+From 9e42f4a8580be57a7b4e7f1c2c3ec779874f0945 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Tue, 4 Oct 2011 13:06:33 +0200
Subject: [PATCH] 90mdraid/mdraid_start.sh: fix path to md sysfs
diff --git a/0066-90mdraid-module-setup.sh-fixed-sed-arguments.patch b/0047-90mdraid-module-setup.sh-fixed-sed-arguments.patch
similarity index 94%
rename from 0066-90mdraid-module-setup.sh-fixed-sed-arguments.patch
rename to 0047-90mdraid-module-setup.sh-fixed-sed-arguments.patch
index a3aa8f7..37662ff 100644
--- a/0066-90mdraid-module-setup.sh-fixed-sed-arguments.patch
+++ b/0047-90mdraid-module-setup.sh-fixed-sed-arguments.patch
@@ -1,4 +1,4 @@
-From 54ffd5447da0a912f91d21dde22d56b0f5762484 Mon Sep 17 00:00:00 2001
+From bd824ae1a2409702075f0d583c4a21619b0907cf Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Tue, 4 Oct 2011 13:30:35 +0200
Subject: [PATCH] 90mdraid/module-setup.sh: fixed sed arguments
diff --git a/0070-convert_abs_rel-fixups.patch b/0048-convert_abs_rel-fixups.patch
similarity index 95%
rename from 0070-convert_abs_rel-fixups.patch
rename to 0048-convert_abs_rel-fixups.patch
index 592d9fe..211e444 100644
--- a/0070-convert_abs_rel-fixups.patch
+++ b/0048-convert_abs_rel-fixups.patch
@@ -1,4 +1,4 @@
-From c1609dd497bb8f8f083a258ff2f7702385eb940b Mon Sep 17 00:00:00 2001
+From 5a04b695465047f409ca1a75821946b3f527c835 Mon Sep 17 00:00:00 2001
From: Michal Soltys <soltys at ziu.info>
Date: Fri, 7 Oct 2011 22:23:49 +0200
Subject: [PATCH] convert_abs_rel() fixups
diff --git a/0074-dracut-functions-conv-normalize-minor-corrections.patch b/0049-dracut-functions-conv-normalize-minor-corrections.patch
similarity index 96%
rename from 0074-dracut-functions-conv-normalize-minor-corrections.patch
rename to 0049-dracut-functions-conv-normalize-minor-corrections.patch
index 0575b00..8d3f39b 100644
--- a/0074-dracut-functions-conv-normalize-minor-corrections.patch
+++ b/0049-dracut-functions-conv-normalize-minor-corrections.patch
@@ -1,4 +1,4 @@
-From c44e3cb4e5ace39247c0a6619668add2d1dc92e8 Mon Sep 17 00:00:00 2001
+From fae2d829dd2a51ac21b42eb1082ffb003b7f35ca Mon Sep 17 00:00:00 2001
From: Michal Soltys <soltys at ziu.info>
Date: Sat, 8 Oct 2011 00:20:50 +0200
Subject: [PATCH] dracut-functions: conv/normalize minor corrections
diff --git a/0081-dracut-lib.sh-fix-dropped-backslashes-in-CMDLINE.patch b/0050-dracut-lib.sh-fix-dropped-backslashes-in-CMDLINE.patch
similarity index 94%
rename from 0081-dracut-lib.sh-fix-dropped-backslashes-in-CMDLINE.patch
rename to 0050-dracut-lib.sh-fix-dropped-backslashes-in-CMDLINE.patch
index 7a69bcd..913f47d 100644
--- a/0081-dracut-lib.sh-fix-dropped-backslashes-in-CMDLINE.patch
+++ b/0050-dracut-lib.sh-fix-dropped-backslashes-in-CMDLINE.patch
@@ -1,4 +1,4 @@
-From 2cd4a8065ac2bb6bf3708d681de56bbe1984c3ce Mon Sep 17 00:00:00 2001
+From cf50065812ad703dfec07afd46ffb6bc9f33996c Mon Sep 17 00:00:00 2001
From: Will Woods <wwoods at redhat.com>
Date: Wed, 12 Oct 2011 22:48:08 -0400
Subject: [PATCH] dracut-lib.sh: fix dropped backslashes in CMDLINE
diff --git a/0090-90livenet-check-for-wget.patch b/0051-90livenet-check-for-wget.patch
similarity index 86%
rename from 0090-90livenet-check-for-wget.patch
rename to 0051-90livenet-check-for-wget.patch
index 9fb6cbf..7182d0c 100644
--- a/0090-90livenet-check-for-wget.patch
+++ b/0051-90livenet-check-for-wget.patch
@@ -1,4 +1,4 @@
-From d73bbd57ee901b8470d9e42f5e004e240e00af62 Mon Sep 17 00:00:00 2001
+From 1e4bca3ad5784979f2548f69c139fd39755b2edc Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Thu, 20 Oct 2011 12:33:33 +0200
Subject: [PATCH] 90livenet: check() for wget
@@ -8,7 +8,7 @@ Subject: [PATCH] 90livenet: check() for wget
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/modules.d/90livenet/module-setup.sh b/modules.d/90livenet/module-setup.sh
-index b166859..3ee7521 100755
+index 3ae72de..2152123 100755
--- a/modules.d/90livenet/module-setup.sh
+++ b/modules.d/90livenet/module-setup.sh
@@ -4,6 +4,7 @@
diff --git a/0091-dracut-logger-re-set-debugging.patch b/0052-dracut-logger-re-set-debugging.patch
similarity index 96%
rename from 0091-dracut-logger-re-set-debugging.patch
rename to 0052-dracut-logger-re-set-debugging.patch
index d2f504c..edeac08 100644
--- a/0091-dracut-logger-re-set-debugging.patch
+++ b/0052-dracut-logger-re-set-debugging.patch
@@ -1,4 +1,4 @@
-From 44cef0d5637f5f6982612d22c92f6d299ec316f9 Mon Sep 17 00:00:00 2001
+From 53592c2b1825dd9ce189108c4468fa7a2076a064 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Thu, 20 Oct 2011 13:04:10 +0200
Subject: [PATCH] dracut-logger: re-set debugging
diff --git a/0092-dracut-functions-inst_dir-handle-relative-symlinks.patch b/0053-dracut-functions-inst_dir-handle-relative-symlinks.patch
similarity index 92%
rename from 0092-dracut-functions-inst_dir-handle-relative-symlinks.patch
rename to 0053-dracut-functions-inst_dir-handle-relative-symlinks.patch
index 4134752..9f25231 100644
--- a/0092-dracut-functions-inst_dir-handle-relative-symlinks.patch
+++ b/0053-dracut-functions-inst_dir-handle-relative-symlinks.patch
@@ -1,4 +1,4 @@
-From b01885338bb0b3daa087f71cfbf895e999e90b9f Mon Sep 17 00:00:00 2001
+From ab5c47343588ad6fc2aacbbd28d3ba0481952c06 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Thu, 20 Oct 2011 13:04:30 +0200
Subject: [PATCH] dracut-functions: inst_dir() handle relative symlinks
@@ -8,7 +8,7 @@ Subject: [PATCH] dracut-functions: inst_dir() handle relative symlinks
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dracut-functions b/dracut-functions
-index 1ef5269..70a467b 100755
+index ce593c9..6732804 100755
--- a/dracut-functions
+++ b/dracut-functions
@@ -290,12 +290,12 @@ inst_dir() {
diff --git a/0093-90livenet-module-setup.sh-silence-check-for-wget.patch b/0054-90livenet-module-setup.sh-silence-check-for-wget.patch
similarity index 87%
rename from 0093-90livenet-module-setup.sh-silence-check-for-wget.patch
rename to 0054-90livenet-module-setup.sh-silence-check-for-wget.patch
index 7dc88f1..36eb639 100644
--- a/0093-90livenet-module-setup.sh-silence-check-for-wget.patch
+++ b/0054-90livenet-module-setup.sh-silence-check-for-wget.patch
@@ -1,4 +1,4 @@
-From 4f6eb791b481bd9cab0729010690ee9376742e2c Mon Sep 17 00:00:00 2001
+From 2273523e6ad8fb1317324ea0a1d9549fcce51bda Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Fri, 21 Oct 2011 09:35:38 +0200
Subject: [PATCH] 90livenet/module-setup.sh: silence check for wget
@@ -8,7 +8,7 @@ Subject: [PATCH] 90livenet/module-setup.sh: silence check for wget
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/modules.d/90livenet/module-setup.sh b/modules.d/90livenet/module-setup.sh
-index 3ee7521..a6ee3e0 100755
+index 2152123..883994b 100755
--- a/modules.d/90livenet/module-setup.sh
+++ b/modules.d/90livenet/module-setup.sh
@@ -4,7 +4,7 @@
diff --git a/0095-90livenet-do-not-install-by-default.patch b/0055-90livenet-do-not-install-by-default.patch
similarity index 86%
rename from 0095-90livenet-do-not-install-by-default.patch
rename to 0055-90livenet-do-not-install-by-default.patch
index 43b39ca..c2a8225 100644
--- a/0095-90livenet-do-not-install-by-default.patch
+++ b/0055-90livenet-do-not-install-by-default.patch
@@ -1,4 +1,4 @@
-From 624c70d763e9a201b5450fea10ac5e32939cf2a2 Mon Sep 17 00:00:00 2001
+From a270c3743648e9e4cfb6c74143d592ec69240730 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Fri, 21 Oct 2011 10:15:09 +0200
Subject: [PATCH] 90livenet: do not install by default
@@ -8,7 +8,7 @@ Subject: [PATCH] 90livenet: do not install by default
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/modules.d/90livenet/module-setup.sh b/modules.d/90livenet/module-setup.sh
-index a6ee3e0..5cfbb75 100755
+index 883994b..c66dd4b 100755
--- a/modules.d/90livenet/module-setup.sh
+++ b/modules.d/90livenet/module-setup.sh
@@ -5,7 +5,7 @@ check() {
diff --git a/0096-dracut-functions-do-not-install-files-from-current-d.patch b/0056-dracut-functions-do-not-install-files-from-current-d.patch
similarity index 98%
rename from 0096-dracut-functions-do-not-install-files-from-current-d.patch
rename to 0056-dracut-functions-do-not-install-files-from-current-d.patch
index fc54552..5c4c155 100644
--- a/0096-dracut-functions-do-not-install-files-from-current-d.patch
+++ b/0056-dracut-functions-do-not-install-files-from-current-d.patch
@@ -1,4 +1,4 @@
-From 4637c5c24252d636fc57af1a9aaaf629140a77c7 Mon Sep 17 00:00:00 2001
+From e04bbec55887c7ab630d13f417e50b35e668a067 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Fri, 21 Oct 2011 10:09:55 +0200
Subject: [PATCH] dracut-functions: do not install files from current
@@ -11,7 +11,7 @@ functions.
1 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/dracut-functions b/dracut-functions
-index 70a467b..a56e460 100755
+index 6732804..23aa14f 100755
--- a/dracut-functions
+++ b/dracut-functions
@@ -272,10 +272,10 @@ check_vol_slaves() {
diff --git a/0001-inst_script-should-call-inst_simple-750603.patch b/0057-inst_script-should-call-inst_simple-750603.patch
similarity index 91%
rename from 0001-inst_script-should-call-inst_simple-750603.patch
rename to 0057-inst_script-should-call-inst_simple-750603.patch
index ad61aa6..3e59608 100644
--- a/0001-inst_script-should-call-inst_simple-750603.patch
+++ b/0057-inst_script-should-call-inst_simple-750603.patch
@@ -1,4 +1,4 @@
-From 0fdc68eb96b2820eedbe789c2544b2bc3a49c549 Mon Sep 17 00:00:00 2001
+From fff06ebb152062ee3a225ee1c31a605c1aa70dfe Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl at redhat.com>
Date: Tue, 1 Nov 2011 12:13:57 -0700
Subject: [PATCH] inst_script should call inst_simple (#750603)
@@ -23,6 +23,3 @@ index 23aa14f..5e2acd3 100755
}
# same as above, but specialized for symlinks
---
-1.7.6.4
-
diff --git a/0058-dracut.spec-fixed-rhel-fedora-version-checks.patch b/0058-dracut.spec-fixed-rhel-fedora-version-checks.patch
new file mode 100644
index 0000000..8b28a6e
--- /dev/null
+++ b/0058-dracut.spec-fixed-rhel-fedora-version-checks.patch
@@ -0,0 +1,111 @@
+From 7e62e485d5940f9eb21ae6670b994d4479a09393 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Mon, 29 Aug 2011 13:11:49 +0200
+Subject: [PATCH] dracut.spec: fixed rhel/fedora version checks
+
+---
+ dracut.spec | 22 +++++++++++-----------
+ 1 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/dracut.spec b/dracut.spec
+index ff004c3..f9848ed 100644
+--- a/dracut.spec
++++ b/dracut.spec
+@@ -11,7 +11,7 @@ Version: xxx
+ Release: xxx
+
+ Summary: Initramfs generator using udev
+-%if 0%{?fedora}
++%if 0%{?fedora} || 0%{?rhel} > 6
+ Group: System Environment/Base
+ %endif
+ %if 0%{?suse_version}
+@@ -25,14 +25,14 @@ Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar
+
+ BuildArch: noarch
+ BuildRequires: dash bash
+-%if 0%{?fedora}
++%if 0%{?fedora} || 0%{?rhel} > 6
+ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ %endif
+ %if 0%{?suse_version}
+ BuildRoot: %{_tmppath}/%{name}-%{version}-build
+ %endif
+
+-%if 0%{?fedora}
++%if 0%{?fedora} || 0%{?rhel} > 6
+ BuildRequires: docbook-style-xsl docbook-dtds libxslt
+ %endif
+
+@@ -73,7 +73,7 @@ Requires: sed
+ Requires: tar
+ Requires: udev
+
+-%if 0%{?fedora}
++%if 0%{?fedora} || 0%{?rhel} > 6
+ Requires: util-linux >= 2.16
+ Requires: initscripts >= 8.63-1
+ Requires: plymouth >= 0.8.0-0.2009.29.09.19.1
+@@ -101,7 +101,7 @@ Requires: nbd
+ Requires: iproute
+ Requires: bridge-utils
+
+-%if 0%{?fedora}
++%if 0%{?fedora} || 0%{?rhel} > 6
+ Requires: iscsi-initiator-utils
+ Requires: nfs-utils
+ Requires: dhclient
+@@ -119,7 +119,7 @@ Provides: dracut-generic = %{version}-%{release}
+ This package requires everything which is needed to build a generic
+ all purpose initramfs with network support with dracut.
+
+-%if 0%{?fedora}
++%if 0%{?fedora} || 0%{?rhel} > 6
+ %package fips
+ Summary: Dracut modules to build a dracut initramfs with an integrity check
+ Requires: %{name} = %{version}-%{release}
+@@ -160,7 +160,7 @@ This package contains tools to assemble the local initrd and host configuration.
+ make
+
+ %install
+-%if 0%{?fedora}
++%if 0%{?fedora} || 0%{?rhel} > 6
+ rm -rf $RPM_BUILD_ROOT
+ %endif
+ make install DESTDIR=$RPM_BUILD_ROOT sbindir=/sbin \
+@@ -168,7 +168,7 @@ make install DESTDIR=$RPM_BUILD_ROOT sbindir=/sbin \
+
+ echo %{name}-%{version}-%{release} > $RPM_BUILD_ROOT/%{_datadir}/dracut/modules.d/10rpmversion/dracut-version
+
+-%if 0%{?fedora} == 0
++%if 0%{?fedora} == 0 && 0%{?rhel} == 0
+ rm -fr $RPM_BUILD_ROOT/%{_datadir}/dracut/modules.d/01fips
+ %endif
+
+@@ -181,7 +181,7 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log
+ touch $RPM_BUILD_ROOT%{_localstatedir}/log/dracut.log
+ mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/initramfs
+
+-%if 0%{?fedora}
++%if 0%{?fedora} || 0%{?rhel} > 6
+ install -m 0644 dracut.conf.d/fedora.conf.example $RPM_BUILD_ROOT/etc/dracut.conf.d/01-dist.conf
+ install -m 0644 dracut.conf.d/fips.conf.example $RPM_BUILD_ROOT/etc/dracut.conf.d/40-fips.conf
+ %endif
+@@ -214,7 +214,7 @@ rm -rf $RPM_BUILD_ROOT
+ %{_datadir}/dracut/dracut-functions
+ %{_datadir}/dracut/dracut-logger
+ %config(noreplace) /etc/dracut.conf
+-%if 0%{?fedora} || 0%{?suse_version}
++%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} > 6
+ %config /etc/dracut.conf.d/01-dist.conf
+ %endif
+ %dir /etc/dracut.conf.d
+@@ -272,7 +272,7 @@ rm -rf $RPM_BUILD_ROOT
+ %{_datadir}/dracut/modules.d/45ifcfg
+ %{_datadir}/dracut/modules.d/95znet
+
+-%if 0%{?fedora}
++%if 0%{?fedora} || 0%{?rhel} > 6
+ %files fips
+ %defattr(-,root,root,0755)
+ %{_datadir}/dracut/modules.d/01fips
diff --git a/0059-dracut.spec-apply-patches-with-git.patch b/0059-dracut.spec-apply-patches-with-git.patch
new file mode 100644
index 0000000..0ebb87d
--- /dev/null
+++ b/0059-dracut.spec-apply-patches-with-git.patch
@@ -0,0 +1,88 @@
+From 86a713c50eb39e827cfc05cd3e59887ae568d449 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Fri, 21 Oct 2011 12:35:07 +0200
+Subject: [PATCH] dracut.spec: apply patches with git
+
+This will take all renames and mode changes.
+---
+ dracut.spec | 10 +++++++++-
+ git2spec.pl | 21 +--------------------
+ 2 files changed, 10 insertions(+), 21 deletions(-)
+
+diff --git a/dracut.spec b/dracut.spec
+index f9848ed..69809ca 100644
+--- a/dracut.spec
++++ b/dracut.spec
+@@ -24,7 +24,7 @@ URL: https://dracut.wiki.kernel.org/
+ Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar.bz2
+
+ BuildArch: noarch
+-BuildRequires: dash bash
++BuildRequires: dash bash git
+ %if 0%{?fedora} || 0%{?rhel} > 6
+ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ %endif
+@@ -155,6 +155,14 @@ This package contains tools to assemble the local initrd and host configuration.
+
+ %prep
+ %setup -q -n %{name}-%{version}
++git init
++git config user.email "dracut-maint at redhat.com"
++git config user.name "Fedora dracut team"
++git add .
++git commit -a -q -m "%{version} baseline."
++
++# Apply all the patches.
++git am -p1 %{patches}
+
+ %build
+ make
+diff --git a/git2spec.pl b/git2spec.pl
+index 2ea74c8..9db42aa 100755
+--- a/git2spec.pl
++++ b/git2spec.pl
+@@ -19,20 +19,12 @@ sub last_tag {
+ sub create_patches {
+ my $tag=shift;
+ my $num=0;
+- open( GIT, 'git format-patch --no-renames -N --no-signature '.$tag.' |');
++ open( GIT, 'git format-patch -N --no-signature '.$tag.' |');
+ @lines=<GIT>;
+ close GIT; # be done
+ return @lines;
+ };
+
+-sub filter_patch {
+- my $patch=shift;
+- open(P, $patch);
+- @lines=<P>;
+- close(P);
+- grep (/^ 0 files changed/, @lines);
+-}
+-
+ use POSIX qw(strftime);
+ my $datestr = strftime "%Y%m%d", gmtime;
+
+@@ -55,22 +47,11 @@ while(<>) {
+ print $_;
+ $num=1;
+ for(@patches) {
+- next if filter_patch $_;
+ print "Patch$num: $_";
+ $num++;
+ }
+ print "\n";
+ }
+- elsif (/^%setup/) {
+- print $_;
+- $num=1;
+- for(@patches) {
+- next if filter_patch $_;
+- print "%patch$num -p1\n";
+- $num++;
+- }
+- print "\n";
+- }
+ else {
+ print $_;
+ }
diff --git a/0060-Makefile-git2spec.pl-use-temporary-builddir.patch b/0060-Makefile-git2spec.pl-use-temporary-builddir.patch
new file mode 100644
index 0000000..1d1f564
--- /dev/null
+++ b/0060-Makefile-git2spec.pl-use-temporary-builddir.patch
@@ -0,0 +1,61 @@
+From 7705aee27a8303d93ee5122f424289769a7a7ad0 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Wed, 9 Nov 2011 09:51:15 +0100
+Subject: [PATCH] Makefile, git2spec.pl: use temporary builddir
+
+to build the dracut rpm, use a temporary builddir
+---
+ Makefile | 12 ++++++------
+ git2spec.pl | 6 ++++--
+ 2 files changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 991058f..80173a3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -66,13 +66,13 @@ dracut-$(VERSION).tar.gz:
+ git archive --format=tar $(VERSION) --prefix=dracut-$(VERSION)/ |gzip > dracut-$(VERSION).tar.gz
+
+ rpm: dracut-$(VERSION).tar.bz2
+- mkdir -p rpmbuild
+- cp dracut-$(VERSION).tar.bz2 rpmbuild
+- cd rpmbuild; ../git2spec.pl $(VERSION) < ../dracut.spec > dracut.spec; \
+- rpmbuild --define "_topdir $$PWD" --define "_sourcedir $$PWD" \
++ rpmbuild=$$(mktemp -d -t rpmbuild-dracut.XXXXXX); src=$$(pwd); \
++ cp dracut-$(VERSION).tar.bz2 "$$rpmbuild"; \
++ $$src/git2spec.pl $(VERSION) "$$rpmbuild" < dracut.spec > $$rpmbuild/dracut.spec; \
++ (cd "$$rpmbuild"; rpmbuild --define "_topdir $$PWD" --define "_sourcedir $$PWD" \
+ --define "_specdir $$PWD" --define "_srcrpmdir $$PWD" \
+- --define "_rpmdir $$PWD" -ba dracut.spec && \
+- ( cd ..; mv rpmbuild/noarch/*.rpm .; mv rpmbuild/*.src.rpm .;rm -fr rpmbuild; ls *.rpm )
++ --define "_rpmdir $$PWD" -ba dracut.spec; ) && \
++ ( mv "$$rpmbuild"/noarch/*.rpm .; mv "$$rpmbuild"/*.src.rpm .;rm -fr "$$rpmbuild"; ls *.rpm )
+
+ syncheck:
+ @ret=0;for i in dracut-logger modules.d/99base/init modules.d/*/*.sh; do \
+diff --git a/git2spec.pl b/git2spec.pl
+index 9db42aa..27e5889 100755
+--- a/git2spec.pl
++++ b/git2spec.pl
+@@ -18,8 +18,9 @@ sub last_tag {
+
+ sub create_patches {
+ my $tag=shift;
++ my $pdir=shift;
+ my $num=0;
+- open( GIT, 'git format-patch -N --no-signature '.$tag.' |');
++ open( GIT, 'git format-patch -N --no-signature -o "'.$pdir.'" '.$tag.' |');
+ @lines=<GIT>;
+ close GIT; # be done
+ return @lines;
+@@ -29,8 +30,9 @@ use POSIX qw(strftime);
+ my $datestr = strftime "%Y%m%d", gmtime;
+
+ my $tag=shift;
++my $pdir=shift;
+ $tag=&last_tag if not defined $tag;
+-my @patches=&create_patches($tag);
++my @patches=&create_patches($tag, $pdir);
+ my $num=$#patches + 2;
+ $tag=~s/[^0-9]+?([0-9]+)/$1/;
+ my $release="$num.git$datestr";
diff --git a/0061-90kernel-modules-module-setup.sh-include-usb-mass-st.patch b/0061-90kernel-modules-module-setup.sh-include-usb-mass-st.patch
new file mode 100644
index 0000000..861c9f7
--- /dev/null
+++ b/0061-90kernel-modules-module-setup.sh-include-usb-mass-st.patch
@@ -0,0 +1,30 @@
+From 1358efd4f100c72c50bbde92da0bb244d89c3511 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Mon, 7 Nov 2011 09:37:55 +0100
+Subject: [PATCH] 90kernel-modules/module-setup.sh: include usb mass storage
+ drivers
+
+backport of commit e696ade15d9284fc6e3499a69a9b389587430a34
+---
+ modules.d/90kernel-modules/module-setup.sh | 7 +------
+ 1 files changed, 1 insertions(+), 6 deletions(-)
+
+diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
+index 9fc4248..0252502 100755
+--- a/modules.d/90kernel-modules/module-setup.sh
++++ b/modules.d/90kernel-modules/module-setup.sh
+@@ -4,13 +4,8 @@
+
+ installkernel() {
+ if [[ -z $drivers ]]; then
+- block_module_test() {
+- local blockfuncs='ahci_init_controller|ata_scsi_ioctl|scsi_add_host|blk_init_queue|register_mtd_blktrans|scsi_esp_register|register_virtio_device'
+-
+- egrep -q "$blockfuncs" "$1"
+- }
+ block_module_filter() {
+- local _blockfuncs='ahci_init_controller|ata_scsi_ioctl|scsi_add_host|blk_init_queue|register_mtd_blktrans|scsi_esp_register|register_virtio_device'
++ local _blockfuncs='ahci_init_controller|ata_scsi_ioctl|scsi_add_host|blk_init_queue|register_mtd_blktrans|scsi_esp_register|register_virtio_device|usb_stor_disconnect'
+ local _f
+ while read _f; do case "$_f" in
+ *.ko) [[ $(< $_f) =~ $_blockfuncs ]] && echo "$_f" ;;
diff --git a/0062-90mdraid-remove-mdadm_auto.sh-completly.patch b/0062-90mdraid-remove-mdadm_auto.sh-completly.patch
new file mode 100644
index 0000000..6072e1d
--- /dev/null
+++ b/0062-90mdraid-remove-mdadm_auto.sh-completly.patch
@@ -0,0 +1,46 @@
+From a5abf964bc93beb676f0da63cc1bf620a1f43f0e Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Wed, 16 Nov 2011 10:50:21 +0100
+Subject: [PATCH] 90mdraid: remove mdadm_auto.sh completly
+
+remove mdadm_auto.sh completly, because "mdadm -As --auto=yes" does not
+add new appearing devices.
+---
+ modules.d/90mdraid/65-md-incremental-imsm.rules | 9 ---------
+ modules.d/90mdraid/mdadm_auto.sh | 7 -------
+ 2 files changed, 0 insertions(+), 16 deletions(-)
+ delete mode 100755 modules.d/90mdraid/mdadm_auto.sh
+
+diff --git a/modules.d/90mdraid/65-md-incremental-imsm.rules b/modules.d/90mdraid/65-md-incremental-imsm.rules
+index 139a599..80e6aab 100644
+--- a/modules.d/90mdraid/65-md-incremental-imsm.rules
++++ b/modules.d/90mdraid/65-md-incremental-imsm.rules
+@@ -29,15 +29,6 @@ ENV{DEVTYPE}!="partition", \
+
+ RUN+="/sbin/initqueue --timeout --name 50-mdraid_start --onetime --unique /sbin/mdraid_start"
+
+-# if rd_MDADMCONF is set, do not assemble incrementally;
+-# defer conf-based assembly until the udev queue is settled
+-#
+-ENV{rd_MDADMCONF}!="?*", GOTO="md_incremental"
+-
+-RUN+="/sbin/initqueue --settled --onetime --unique /sbin/mdadm_auto"
+-
+-GOTO="md_end"
+-
+ #
+ # Incrementally build the md array; this will automatically assemble
+ # any eventual containers as well (imsm, ddf)
+diff --git a/modules.d/90mdraid/mdadm_auto.sh b/modules.d/90mdraid/mdadm_auto.sh
+deleted file mode 100755
+index 9b61bf5..0000000
+--- a/modules.d/90mdraid/mdadm_auto.sh
++++ /dev/null
+@@ -1,7 +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
+-
+-info "Autoassembling MD Raid"
+-mdadm -As --auto=yes 2>&1 | vinfo
diff --git a/0063-cryptroot-ask.sh-use-key-file-if-specified-in-cryptt.patch b/0063-cryptroot-ask.sh-use-key-file-if-specified-in-cryptt.patch
new file mode 100644
index 0000000..d761ded
--- /dev/null
+++ b/0063-cryptroot-ask.sh-use-key-file-if-specified-in-cryptt.patch
@@ -0,0 +1,70 @@
+From baa2ead155b4e6a40f88e893d29e4cb316ae7965 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Wed, 16 Nov 2011 11:36:46 +0100
+Subject: [PATCH] cryptroot-ask.sh: use key file, if specified in crypttab and
+ present
+
+if a key file is specified in crypttab and present in the initramfs use
+it to open the device.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=751640
+
+backport of commit 4e05cb4023966a828ad90432816467a1da540120
+---
+ modules.d/90crypt/cryptroot-ask.sh | 21 ++++++++++++++++-----
+ 1 files changed, 16 insertions(+), 5 deletions(-)
+
+diff --git a/modules.d/90crypt/cryptroot-ask.sh b/modules.d/90crypt/cryptroot-ask.sh
+index f8e1bd8..88938d7 100755
+--- a/modules.d/90crypt/cryptroot-ask.sh
++++ b/modules.d/90crypt/cryptroot-ask.sh
+@@ -31,7 +31,7 @@ fi
+
+ # TODO: improve to support what cmdline does
+ if [ -f /etc/crypttab ] && getargbool 1 rd.luks.crypttab -n rd_NO_CRYPTTAB; then
+- while read name dev rest; do
++ while read name dev luksfile rest; do
+ # ignore blank lines and comments
+ if [ -z "$name" -o "${name#\#}" != "$name" ]; then
+ continue
+@@ -61,7 +61,14 @@ fi
+ # Open LUKS device
+ #
+
+-info "luksOpen $device $luksname"
++info "luksOpen $device $luksname $luksfile"
++ask_passphrase=1
++
++if [ -n "$luksfile" -a "$luksfile" != "none" -a -e "$luksfile" ]; then
++ if cryptsetup --key-file "$luksfile" luksOpen "$device" "$luksname"; then
++ ask_passphrase=0
++ fi
++fi
+
+ if [ -n "$(getarg rd.luks.key)" ]; then
+ if tmp=$(getkey /tmp/luks.keys $device); then
+@@ -78,9 +85,13 @@ if [ -n "$(getarg rd.luks.key)" ]; then
+
+ info "Using '$keypath' on '$keydev'"
+ readkey "$keypath" "$keydev" "$device" \
+- | cryptsetup -d - luksOpen "$device" "$luksname"
++ | cryptsetup -d - luksOpen "$device" "$luksname" \
++ && ask_passphrase=0
++
+ unset keypath keydev
+-else
++fi
++
++if [ $ask_passphrase -ne 0 ]; then
+ luks_open="$(command -v cryptsetup) luksOpen"
+ ask_for_password --ply-tries 5 \
+ --ply-cmd "$luks_open -T1 $device $luksname" \
+@@ -90,7 +101,7 @@ else
+ unset luks_open
+ fi
+
+-unset device luksname
++unset device luksname luksfile
+
+ # mark device as asked
+ >> /tmp/cryptroot-asked-$2
diff --git a/0064-90mdraid-wait-for-md-devices-to-become-clean.patch b/0064-90mdraid-wait-for-md-devices-to-become-clean.patch
new file mode 100644
index 0000000..58c786c
--- /dev/null
+++ b/0064-90mdraid-wait-for-md-devices-to-become-clean.patch
@@ -0,0 +1,56 @@
+From e8afcd2b866da7f1af56d5ccaa395eec6500f135 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Thu, 17 Nov 2011 10:14:23 +0100
+Subject: [PATCH] 90mdraid: wait for md devices to become clean
+
+After assembling all devices, just wait for the raid devices to become
+clean, before booting further.
+---
+ modules.d/90mdraid/mdraid-waitclean.sh | 25 +++++++++++++++++++++++++
+ modules.d/90mdraid/module-setup.sh | 1 +
+ 2 files changed, 26 insertions(+), 0 deletions(-)
+ create mode 100755 modules.d/90mdraid/mdraid-waitclean.sh
+
+diff --git a/modules.d/90mdraid/mdraid-waitclean.sh b/modules.d/90mdraid/mdraid-waitclean.sh
+new file mode 100755
+index 0000000..c062fc7
+--- /dev/null
++++ b/modules.d/90mdraid/mdraid-waitclean.sh
+@@ -0,0 +1,25 @@
++#!/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 fe793bb..029d667 100755
+--- a/modules.d/90mdraid/module-setup.sh
++++ b/modules.d/90mdraid/module-setup.sh
+@@ -83,6 +83,7 @@ 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/0065-99base-init-only-poll-cdroms-if-the-kernel-does-supp.patch b/0065-99base-init-only-poll-cdroms-if-the-kernel-does-supp.patch
new file mode 100644
index 0000000..b651586
--- /dev/null
+++ b/0065-99base-init-only-poll-cdroms-if-the-kernel-does-supp.patch
@@ -0,0 +1,63 @@
+From 71e1f085cceb5023661ab6c5bdd147a0f2a92b5c Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Mon, 29 Aug 2011 19:12:12 +0200
+Subject: [PATCH] 99base/init: only poll cdroms, if the kernel does support
+ autopolling
+
+---
+ modules.d/99base/init | 34 +++++++++++++++-------------------
+ 1 files changed, 15 insertions(+), 19 deletions(-)
+
+diff --git a/modules.d/99base/init b/modules.d/99base/init
+index b61680a..dc2cdfa 100755
+--- a/modules.d/99base/init
++++ b/modules.d/99base/init
+@@ -201,7 +201,8 @@ getarg 'rd.break=pre-trigger' 'rdbreak=pre-trigger' && emergency_shell -n pre-tr
+ source_hook pre-trigger
+
+ # then the rest
+-udevadm trigger --action=add $udevtriggeropts >/dev/null 2>&1
++udevadm trigger --type=subsystems --action=add >/dev/null 2>&1
++udevadm trigger --type=devices --action=add >/dev/null 2>&1
+
+ getarg 'rd.break=initqueue' 'rdbreak=initqueue' && emergency_shell -n initqueue "Break before initqueue"
+
+@@ -242,25 +243,20 @@ while :; do
+ # no more udev jobs and queues empty.
+ sleep 0.5
+
+- # dirty hack for some cdrom drives,
+- # which report no medium for quiet
+- # some time.
+- for cdrom in /sys/block/sr*; do
+- [ -e "$cdrom" ] || continue
+- # skip, if cdrom medium was already found
+- strstr "$(udevadm info --query=env --path=${cdrom##/sys})" \
+- ID_CDROM_MEDIA && continue
+-
+- if [ -e "$cdrom"/events_poll_msecs -a ! -e "/tmp/.poll_${cdrom##*/}" ]; then
+- msecs=$(while read a; do echo $a;done < "$cdrom"/events_poll_msecs)
+- if [ "$msecs" = "-1" ]; then
+- echo 250 > "$cdrom"/events_poll_msecs
+- > "/tmp/.poll_${cdrom##*/}"
+- fi
+- else
++ if [ ! -e /sys/module/block/parameters/uevent ]; then
++ # if the kernel does not support autopolling
++ # then we have to do a
++ # dirty hack for some cdrom drives,
++ # which report no medium for quiet
++ # some time.
++ for cdrom in /sys/block/sr*; do
++ [ -e "$cdrom" ] || continue
++ # skip, if cdrom medium was already found
++ strstr "$(udevadm info --query=env --path=${cdrom##/sys})" \
++ ID_CDROM_MEDIA && continue
+ echo change > "$cdrom/uevent"
+- fi
+- done
++ done
++ fi
+
+ if [ $main_loop -gt $(($RDRETRY/2)) ]; then
+ for job in $hookdir/initqueue/timeout/*.sh; do
diff --git a/0066-99base-init-removed-cdrom-polling-reset-code.patch b/0066-99base-init-removed-cdrom-polling-reset-code.patch
new file mode 100644
index 0000000..908ab6a
--- /dev/null
+++ b/0066-99base-init-removed-cdrom-polling-reset-code.patch
@@ -0,0 +1,29 @@
+From 70f51cc824fa3a576934d02c0cc340ccfd9c2db1 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Fri, 2 Sep 2011 09:01:05 +0200
+Subject: [PATCH] 99base/init: removed cdrom polling reset code
+
+This is done globally now.
+---
+ modules.d/99base/init | 8 --------
+ 1 files changed, 0 insertions(+), 8 deletions(-)
+
+diff --git a/modules.d/99base/init b/modules.d/99base/init
+index dc2cdfa..1f0e342 100755
+--- a/modules.d/99base/init
++++ b/modules.d/99base/init
+@@ -275,14 +275,6 @@ unset queuetriggered
+ unset main_loop
+ unset RDRETRY
+
+-# reset cdrom polling
+-for cdrom in /sys/block/sr*; do
+- [ -e "$cdrom" ] || continue
+- if [ -e "$cdrom"/events_poll_msecs ]; then
+- echo -1 > "$cdrom"/events_poll_msecs
+- fi
+-done
+-
+ # pre-mount happens before we try to mount the root filesystem,
+ # and happens once.
+ getarg 'rd.break=pre-mount' 'rdbreak=pre-mount' && emergency_shell -n pre-mount "Break pre-mount"
diff --git a/0067-99base-init-fix-check-for-in-kernel-polling.patch b/0067-99base-init-fix-check-for-in-kernel-polling.patch
new file mode 100644
index 0000000..ca8c3db
--- /dev/null
+++ b/0067-99base-init-fix-check-for-in-kernel-polling.patch
@@ -0,0 +1,22 @@
+From 7652817a404ffedb36bef56a5c6a08cf8c341fb3 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Thu, 20 Oct 2011 11:13:34 +0200
+Subject: [PATCH] 99base/init: fix check for in kernel polling
+
+---
+ modules.d/99base/init | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/modules.d/99base/init b/modules.d/99base/init
+index 1f0e342..acdda43 100755
+--- a/modules.d/99base/init
++++ b/modules.d/99base/init
+@@ -243,7 +243,7 @@ while :; do
+ # no more udev jobs and queues empty.
+ sleep 0.5
+
+- if [ ! -e /sys/module/block/parameters/uevent ]; then
++ if [ ! -e /sys/module/block/parameters/events_dfl_poll_msecs ]; then
+ # if the kernel does not support autopolling
+ # then we have to do a
+ # dirty hack for some cdrom drives,
diff --git a/0068-dracut-add-install_items-to-dracut.conf.patch b/0068-dracut-add-install_items-to-dracut.conf.patch
new file mode 100644
index 0000000..063175c
--- /dev/null
+++ b/0068-dracut-add-install_items-to-dracut.conf.patch
@@ -0,0 +1,67 @@
+From fb2cd653896619a2bb2b494b70e8e9edfdef06fb Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Tue, 15 Nov 2011 17:12:50 +0100
+Subject: [PATCH] dracut: add install_items to dracut.conf
+
+install_items+=" <file>[ <file> ...] "
+
+ Specify additional files to include in the initramfs, separated by
+ spaces.
+
+Backport of commit 0ec40e08d5649cc3f42d1b8af1ac49a28d1e6765
+---
+ dracut | 9 +++++++--
+ dracut.conf.5.xml | 8 ++++++++
+ 2 files changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/dracut b/dracut
+index ddafdef..c196e8e 100755
+--- a/dracut
++++ b/dracut
+@@ -202,13 +202,12 @@ while (($# > 0)); do
+ -o|--omit) push_arg omit_dracutmodules_l "$@" || shift;;
+ -d|--drivers) push_arg drivers_l "$@" || shift;;
+ --filesystems) push_arg filesystems_l "$@" || shift;;
+- -I|--install) push_arg install_items "$@" || shift;;
++ -I|--install) push_arg install_items_l "$@" || shift;;
+ --fwdir) push_arg fw_dir_l "$@" || shift;;
+ -k|--kmoddir) read_arg drivers_dir_l "$@" || shift;;
+ -c|--conf) read_arg conffile "$@" || shift;;
+ --confdir) read_arg confdir "$@" || shift;;
+ -L|--stdlog) read_arg stdloglvl_l "$@" || shift;;
+- -I|--install) read_arg install_items "$@" || shift;;
+ --fwdir) read_arg fw_dir_l "$@" || shift;;
+ --compress) read_arg compress_l "$@" || shift;;
+ --prefix) read_arg prefix_l "$@" || shift;;
+@@ -323,6 +322,12 @@ if (( ${#add_drivers_l[@]} )); then
+ done
+ fi
+
++if (( ${#install_items_l[@]} )); then
++ while pop install_items_l val; do
++ push install_items $val
++ done
++fi
++
+ # these options override the stuff in the config file
+ if (( ${#dracutmodules_l[@]} )); then
+ dracutmodules=''
+diff --git a/dracut.conf.5.xml b/dracut.conf.5.xml
+index 697e655..2e08eab 100644
+--- a/dracut.conf.5.xml
++++ b/dracut.conf.5.xml
+@@ -112,6 +112,14 @@ initramfs.</para>
+ </varlistentry>
+ <varlistentry>
+ <term>
++ <envar>install_items+=" <replaceable><file></replaceable>[ <replaceable><file></replaceable> ...] "</envar>
++ </term>
++ <listitem>
++ <para>Specify additional files to include in the initramfs, separated by spaces.</para>
++ </listitem>
++ </varlistentry>
++ <varlistentry>
++ <term>
+ <envar>do_strip="<replaceable>{yes|no}</replaceable>"</envar>
+ </term>
+ <listitem>
diff --git a/0069-git2spec.pl-strip-path-from-patches.patch b/0069-git2spec.pl-strip-path-from-patches.patch
new file mode 100644
index 0000000..8e31e7e
--- /dev/null
+++ b/0069-git2spec.pl-strip-path-from-patches.patch
@@ -0,0 +1,21 @@
+From f863c2c020e2509b6562b11484aac1ef41409101 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Thu, 17 Nov 2011 11:01:41 +0100
+Subject: [PATCH] git2spec.pl: strip path from patches
+
+---
+ git2spec.pl | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/git2spec.pl b/git2spec.pl
+index 27e5889..38f899a 100755
+--- a/git2spec.pl
++++ b/git2spec.pl
+@@ -49,6 +49,7 @@ while(<>) {
+ print $_;
+ $num=1;
+ for(@patches) {
++ s/.*\///g;
+ print "Patch$num: $_";
+ $num++;
+ }
diff --git a/dracut.spec b/dracut.spec
index 891051a..882ec61 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -8,7 +8,7 @@
Name: dracut
Version: 013
-Release: 18%{?dist}
+Release: 19%{?dist}
Summary: Initramfs generator using udev
%if 0%{?fedora} || 0%{?rhel} > 6
@@ -22,67 +22,77 @@ URL: https://dracut.wiki.kernel.org/
# Source can be generated by
# http://git.kernel.org/?p=boot/dracut/dracut.git;a=snapshot;h=%{version};sf=tgz
Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar.bz2
+Patch1: 0001-90dmsquash-live-dmsquash-live-root-include-fs_lib.sh.patch
+Patch2: 0002-fix-live-crash-with-livenet-installed.patch
+Patch3: 0003-dracut-functions-s-emergency-shutdown-shutdown-emerg.patch
+Patch4: 0004-dracut-functions-speed-up-inst_dir.patch
+Patch5: 0005-dracut-functions-new-function-inst_any-d-dest-f1-f2-.patch
+Patch6: 0006-dracut-functions-fix-inst_dir-for-non-absolute-dirs.patch
+Patch7: 0007-90mdraid-65-md-incremental-imsm.rules-incremental-ru.patch
+Patch8: 0008-build-initramfs-unclear-_mpargs-in-instmods.patch
+Patch9: 0009-99base-init-save-and-restore-environment-given-from-.patch
+Patch10: 0010-dracut-functions-hmac-checksum-files-can-be-symlinks.patch
+Patch11: 0011-95udev-rules-add-input_id.patch
+Patch12: 0012-inst_simple-inst_dir-make-fast-case-faster.patch
+Patch13: 0013-filter_kernel_modules-is-a-specialized-filter_kernel.patch
+Patch14: 0014-install_kmod_with_fw-make-fast-case-faster.patch
+Patch15: 0015-instmods-get-filenames-from-stdin-if-no-args-use-it.patch
+Patch16: 0016-instmods-sanity-for-_mpargs.patch
+Patch17: 0017-instmods-factor-out-egrep-of-FATAL-Module-.-not-foun.patch
+Patch18: 0018-99base-init-do-not-fail-when-importing-the-original-.patch
+Patch19: 0019-dracut-cp-with-sparse.patch
+Patch20: 0020-dmsquash-live-root-use-blkid-to-determine-fstype-of-.patch
+Patch21: 0021-dmsquash-live-root-load-filesystem-modules-before-mo.patch
+Patch22: 0022-99base-init-remove-dev-root-helper-symlink.patch
+Patch23: 0023-Do-not-use-run-udev-rules.d-for-udev-rules.patch
+Patch24: 0024-99base-init-mount-securityfs-with-source-securityfs-.patch
+Patch25: 0025-mount-securityfs-in-a-seperate-dracut-module.patch
+Patch26: 0026-mount-securityfs-in-a-seperate-dracut-module.patch
+Patch27: 0027-90mdraid-adjust-stock-mdadm-udev-rules.patch
+Patch28: 0028-90mdraid-containers-are-not-runnable.patch
+Patch29: 0029-90mdraid-fix-adjust-mdraid-cleanup.patch
+Patch30: 0030-90mdraid-fix-adjust-force-run-script.patch
+Patch31: 0031-90-md-dm-raid-recognize-ddf-container.patch
+Patch32: 0032-90mdraid-fix-adjust-65-md-rules-and-related-scripts.patch
+Patch33: 0033-TEST-40-NBD-relaxed-check-on-ext3-filesystem-options.patch
+Patch34: 0034-99fs-lib-fs-lib.sh-fsck-btrfs-via-mounting-like-xfs.patch
+Patch35: 0035-dracut-functions-inst_rules-do-not-check-std-dirs-fo.patch
+Patch36: 0036-str_replace-fix.patch
+Patch37: 0037-dracut-logger-bail-out-early-if-we-don-t-have-to-log.patch
+Patch38: 0038-dracut-create-dev-besides-proc-sys-and-so.patch
+Patch39: 0039-99fs-lib-export-FSTAB_FILE-before-fsck-call.patch
+Patch40: 0040-dracut-functions-inst_rules-add-missing.patch
+Patch41: 0041-90mdraid-check-precisely-for-supported-contaiers.patch
+Patch42: 0042-90mdraid-more-thorough-64-md-raid.rules-edit.patch
+Patch43: 0043-90mdraid-adjust-dev-md-loops.patch
+Patch44: 0044-dracut-PATCH-Parameter-expansion-occurs-before-comma.patch
+Patch45: 0045-order-mdadm-and-lvm-timeout-operations.patch
+Patch46: 0046-90mdraid-mdraid_start.sh-fix-path-to-md-sysfs.patch
+Patch47: 0047-90mdraid-module-setup.sh-fixed-sed-arguments.patch
+Patch48: 0048-convert_abs_rel-fixups.patch
+Patch49: 0049-dracut-functions-conv-normalize-minor-corrections.patch
+Patch50: 0050-dracut-lib.sh-fix-dropped-backslashes-in-CMDLINE.patch
+Patch51: 0051-90livenet-check-for-wget.patch
+Patch52: 0052-dracut-logger-re-set-debugging.patch
+Patch53: 0053-dracut-functions-inst_dir-handle-relative-symlinks.patch
+Patch54: 0054-90livenet-module-setup.sh-silence-check-for-wget.patch
+Patch55: 0055-90livenet-do-not-install-by-default.patch
+Patch56: 0056-dracut-functions-do-not-install-files-from-current-d.patch
+Patch57: 0057-inst_script-should-call-inst_simple-750603.patch
+Patch58: 0058-dracut.spec-fixed-rhel-fedora-version-checks.patch
+Patch59: 0059-dracut.spec-apply-patches-with-git.patch
+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
+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
-Patch2: 0002-90dmsquash-live-dmsquash-live-root-include-fs_lib.sh.patch
-Patch3: 0003-fix-live-crash-with-livenet-installed.patch
-Patch6: 0006-dracut-functions-s-emergency-shutdown-shutdown-emerg.patch
-Patch9: 0009-dracut-functions-speed-up-inst_dir.patch
-Patch12: 0012-dracut-functions-new-function-inst_any-d-dest-f1-f2-.patch
-Patch17: 0017-dracut-functions-fix-inst_dir-for-non-absolute-dirs.patch
-Patch18: 0018-90mdraid-65-md-incremental-imsm.rules-incremental-ru.patch
-Patch22: 0022-build-initramfs-unclear-_mpargs-in-instmods.patch
-Patch24: 0024-99base-init-save-and-restore-environment-given-from-.patch
-Patch26: 0026-dracut-functions-hmac-checksum-files-can-be-symlinks.patch
-Patch27: 0027-95udev-rules-add-input_id.patch
-Patch28: 0028-inst_simple-inst_dir-make-fast-case-faster.patch
-Patch29: 0029-filter_kernel_modules-is-a-specialized-filter_kernel.patch
-Patch30: 0030-install_kmod_with_fw-make-fast-case-faster.patch
-Patch31: 0031-instmods-get-filenames-from-stdin-if-no-args-use-it.patch
-Patch32: 0032-instmods-sanity-for-_mpargs.patch
-Patch33: 0033-instmods-factor-out-egrep-of-FATAL-Module-.-not-foun.patch
-Patch34: 0034-99base-init-do-not-fail-when-importing-the-original-.patch
-Patch35: 0035-dracut-cp-with-sparse.patch
-Patch37: 0037-dmsquash-live-root-use-blkid-to-determine-fstype-of-.patch
-Patch38: 0038-dmsquash-live-root-load-filesystem-modules-before-mo.patch
-Patch40: 0040-99base-init-remove-dev-root-helper-symlink.patch
-Patch41: 0041-Do-not-use-run-udev-rules.d-for-udev-rules.patch
-Patch42: 0042-99base-init-mount-securityfs-with-source-securityfs-.patch
-Patch43: 0043-mount-securityfs-in-a-seperate-dracut-module.patch
-Patch44: 0044-mount-securityfs-in-a-seperate-dracut-module.patch
-Patch45: 0045-90mdraid-adjust-stock-mdadm-udev-rules.patch
-Patch46: 0046-90mdraid-containers-are-not-runnable.patch
-Patch47: 0047-90mdraid-fix-adjust-mdraid-cleanup.patch
-Patch48: 0048-90mdraid-fix-adjust-force-run-script.patch
-Patch49: 0049-90-md-dm-raid-recognize-ddf-container.patch
-Patch50: 0050-90mdraid-fix-adjust-65-md-rules-and-related-scripts.patch
-Patch51: 0051-TEST-40-NBD-relaxed-check-on-ext3-filesystem-options.patch
-Patch52: 0052-99fs-lib-fs-lib.sh-fsck-btrfs-via-mounting-like-xfs.patch
-Patch53: 0053-dracut-functions-inst_rules-do-not-check-std-dirs-fo.patch
-Patch54: 0054-str_replace-fix.patch
-Patch55: 0055-dracut-logger-bail-out-early-if-we-don-t-have-to-log.patch
-Patch56: 0056-dracut-create-dev-besides-proc-sys-and-so.patch
-Patch57: 0057-99fs-lib-export-FSTAB_FILE-before-fsck-call.patch
-Patch58: 0058-dracut-functions-inst_rules-add-missing.patch
-Patch59: 0059-90mdraid-check-precisely-for-supported-contaiers.patch
-Patch60: 0060-90mdraid-more-thorough-64-md-raid.rules-edit.patch
-Patch61: 0061-90mdraid-adjust-dev-md-loops.patch
-Patch62: 0062-dracut-PATCH-Parameter-expansion-occurs-before-comma.patch
-Patch64: 0064-order-mdadm-and-lvm-timeout-operations.patch
-Patch65: 0065-90mdraid-mdraid_start.sh-fix-path-to-md-sysfs.patch
-Patch66: 0066-90mdraid-module-setup.sh-fixed-sed-arguments.patch
-Patch70: 0070-convert_abs_rel-fixups.patch
-Patch74: 0074-dracut-functions-conv-normalize-minor-corrections.patch
-Patch81: 0081-dracut-lib.sh-fix-dropped-backslashes-in-CMDLINE.patch
-Patch90: 0090-90livenet-check-for-wget.patch
-Patch91: 0091-dracut-logger-re-set-debugging.patch
-Patch92: 0092-dracut-functions-inst_dir-handle-relative-symlinks.patch
-Patch93: 0093-90livenet-module-setup.sh-silence-check-for-wget.patch
-Patch95: 0095-90livenet-do-not-install-by-default.patch
-Patch96: 0096-dracut-functions-do-not-install-files-from-current-d.patch
-Patch97: 0001-inst_script-should-call-inst_simple-750603.patch
BuildArch: noarch
-BuildRequires: dash bash
+BuildRequires: dash bash git
%if 0%{?fedora} || 0%{?rhel} > 6
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%endif
@@ -213,66 +223,15 @@ This package contains tools to assemble the local initrd and host configuration.
%prep
%setup -q -n %{name}-%{version}
-%patch2 -p1
-%patch3 -p1
-%patch6 -p1
-%patch9 -p1
-%patch12 -p1
-%patch17 -p1
-%patch18 -p1
-%patch22 -p1
-%patch24 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-%patch34 -p1
-%patch35 -p1
-%patch37 -p1
-%patch38 -p1
-%patch40 -p1
-%patch41 -p1
-%patch42 -p1
-%patch43 -p1
-%patch44 -p1
-%patch45 -p1
-%patch46 -p1
-%patch47 -p1
-%patch48 -p1
-%patch49 -p1
-%patch50 -p1
-%patch51 -p1
-%patch52 -p1
-%patch53 -p1
-%patch54 -p1
-%patch55 -p1
-%patch56 -p1
-%patch57 -p1
-%patch58 -p1
-%patch59 -p1
-%patch60 -p1
-%patch61 -p1
-%patch62 -p1
-%patch64 -p1
-%patch65 -p1
-%patch66 -p1
-%patch70 -p1
-%patch74 -p1
-%patch81 -p1
-%patch90 -p1
-%patch91 -p1
-%patch92 -p1
-%patch93 -p1
-%patch95 -p1
-%patch96 -p1
-%patch97 -p1
-
-chmod a+x modules.d/*/*.sh
-find . -name '*.orig' -print0 | xargs -0 rm -f
+git init
+git config user.email "dracut-maint at redhat.com"
+git config user.name "Fedora dracut team"
+git add .
+git commit -a -q -m "%{version} baseline."
+
+# Apply all the patches.
+git am -p1 %{patches}
+
%build
make
@@ -411,6 +370,14 @@ rm -rf $RPM_BUILD_ROOT
%dir /var/lib/dracut/overlay
%changelog
+* Thu Nov 17 2011 Harald Hoyer <harald at redhat.com> 013-19
+- fixed mdraid handling
+Resolves: rhbz#751667
+- fix cdrom polling
+- support opening crypto devs with file
+ support install_items in dracut.conf
+Resolves: rhbz#751640
+
* Tue Nov 01 2011 Tom Callaway <spot at fedoraproject.org> 013-18
- do not try to run inst_binary on a shell script if we know
it is a shell script, this fails. call inst_simple instead.
More information about the scm-commits
mailing list