[dracut/f14/master] - removed patch backup files - removed mount requirement, because mount is part of util-linux-ng -
Harald Hoyer
harald at fedoraproject.org
Tue Jan 18 09:09:04 UTC 2011
commit b5b2de85f93f7a47b237c08db2c76f9f867b0438
Author: Harald Hoyer <harald at redhat.com>
Date: Tue Jan 18 10:10:13 2011 +0100
- removed patch backup files
- removed mount requirement, because mount is part of
util-linux-ng
- patch for 642617 got lost
Resolves: rhbz#642617 rhbz#665359
- fixed minimal install + dm-crypt - LVM
Resolves: rhbz#649743
- supress warnings about nonexistant modules for custom kernels
Resolves: rhbz#645551
- search also in "extra" and "weak-updates" for kernel modules
Resolves: rhbz#622888
0001-Fix-ahci-detection-in-kernel-2.6.35.patch | 5 +--
0002-fixed-ip-dhcp6.patch | 5 +--
...d-note-about-putting-IPv6-addresses-in-br.patch | 5 +--
...anged-IPv6-addresses-to-the-documentation.patch | 5 +--
0005-fips-fixes-copy-paste-error-for-check.patch | 5 +--
0006-crypt-add-fpu-kernel-module.patch | 5 +--
...-for-symlinks-to-dev-.udev-rules.d-for-la.patch | 5 +--
...nctions-set-LANG-C-for-ldd-output-parsing.patch | 5 +--
...functions-use-LC_ALL-C-rather-than-LANG-C.patch | 5 +--
...knod-with-mode-and-set-umask-for-the-rest.patch | 5 +--
0011-base-init-do-not-set-umask.patch | 5 +--
...outh-depend-on-crypt-if-cryptsetup-exists.patch | 18 +++++++
0013-crypt-depend-on-dm.patch | 22 ++++++++
0014-dmsquash-live-depend-on-dm-module.patch | 25 +++++++++
...-install-install-dmeventd-only-if-present.patch | 20 +++++++
...dprobe-errors-on-builtins-credits-to-Kay-.patch | 23 ++++++++
...tions-filter_kernel_modules-search-in-ext.patch | 24 +++++++++
...tions-suppress-modinfo-errors-for-hostonl.patch | 22 ++++++++
....spec-requires-bin-mount-instead-of-mount.patch | 22 ++++++++
dracut.spec | 54 +++++++++++++++-----
20 files changed, 228 insertions(+), 57 deletions(-)
---
diff --git a/0001-Fix-ahci-detection-in-kernel-2.6.35.patch b/0001-Fix-ahci-detection-in-kernel-2.6.35.patch
index 2b5b504..8a67375 100644
--- a/0001-Fix-ahci-detection-in-kernel-2.6.35.patch
+++ b/0001-Fix-ahci-detection-in-kernel-2.6.35.patch
@@ -1,7 +1,7 @@
From ef9aefa776a15fc5b3bb480e2f292f821f555bc8 Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar at mail.ru>
Date: Thu, 5 Aug 2010 20:06:57 +0400
-Subject: [PATCH 01/10] Fix ahci detection in kernel 2.6.35
+Subject: [PATCH] Fix ahci detection in kernel 2.6.35
Kernel 2.6.35 (may be, earlier) split ahci into libahci.ko and ahci.ko
and added ahci_platform.ko. As a result, drivers ahci and ahci_platform
@@ -28,6 +28,3 @@ index 2171e5a..e679b10 100755
egrep -q "$blockfuncs" "$1"
}
---
-1.7.3.1
-
diff --git a/0002-fixed-ip-dhcp6.patch b/0002-fixed-ip-dhcp6.patch
index b116bc6..8826976 100644
--- a/0002-fixed-ip-dhcp6.patch
+++ b/0002-fixed-ip-dhcp6.patch
@@ -1,7 +1,7 @@
From 1e894f9061b35decbed6c6a7d127348b7f8917e2 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Thu, 17 Jun 2010 16:25:28 +0200
-Subject: [PATCH 02/10] fixed "ip=dhcp6"
+Subject: [PATCH] fixed "ip=dhcp6"
---
modules.d/40network/parse-ip-opts.sh | 2 +-
@@ -20,6 +20,3 @@ index 7362669..a3c9597 100755
[ -n "$NEEDBOOTDEV" ] && [ -z "$dev" ] && \
die "Sorry, 'ip=$p' does not make sense for multiple interface configurations"
[ -n "$ip" ] && \
---
-1.7.3.1
-
diff --git a/0003-dracut.8-add-note-about-putting-IPv6-addresses-in-br.patch b/0003-dracut.8-add-note-about-putting-IPv6-addresses-in-br.patch
index 095f46f..13011f1 100644
--- a/0003-dracut.8-add-note-about-putting-IPv6-addresses-in-br.patch
+++ b/0003-dracut.8-add-note-about-putting-IPv6-addresses-in-br.patch
@@ -1,7 +1,7 @@
From 7b09a1b9ee02f4f7be623bed288ee03b4c60300a Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Thu, 17 Jun 2010 17:03:38 +0200
-Subject: [PATCH 03/10] dracut.8: add note about putting IPv6 addresses in brackets
+Subject: [PATCH] dracut.8: add note about putting IPv6 addresses in brackets
---
dracut.8 | 11 ++++++++++-
@@ -43,6 +43,3 @@ index 4050541..1417c36 100644
.TP
.ad l
.BR \%root= \%??? " \%iscsi_initiator=" \%<initiator> " \%iscsi_target_name=" "<target name>" " \%iscsi_target_ip=" "<target ip>" " \%iscsi_target_port=" "<target port>" " \%iscsi_target_group=" "<target group>" " \%iscsi_username=" "<username>" " \%iscsi_password=" <password> " \%iscsi_in_username=" "<in username>" " \%iscsi_in_password=" "<in password>"
---
-1.7.3.1
-
diff --git a/0004-dracut.8-changed-IPv6-addresses-to-the-documentation.patch b/0004-dracut.8-changed-IPv6-addresses-to-the-documentation.patch
index ba3c690..e14ea57 100644
--- a/0004-dracut.8-changed-IPv6-addresses-to-the-documentation.patch
+++ b/0004-dracut.8-changed-IPv6-addresses-to-the-documentation.patch
@@ -1,7 +1,7 @@
From bae2040264bcef7308cb0593044ae358b4c2f4fe Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Thu, 17 Jun 2010 17:14:09 +0200
-Subject: [PATCH 04/10] dracut.8: changed IPv6 addresses to the documentation address space
+Subject: [PATCH] dracut.8: changed IPv6 addresses to the documentation address space
---
dracut.8 | 6 +++---
@@ -38,6 +38,3 @@ index 1417c36..45d3295 100644
.TP
.ad l
.BR \%root= \%??? " \%iscsi_initiator=" \%<initiator> " \%iscsi_target_name=" "<target name>" " \%iscsi_target_ip=" "<target ip>" " \%iscsi_target_port=" "<target port>" " \%iscsi_target_group=" "<target group>" " \%iscsi_username=" "<username>" " \%iscsi_password=" <password> " \%iscsi_in_username=" "<in username>" " \%iscsi_in_password=" "<in password>"
---
-1.7.3.1
-
diff --git a/0005-fips-fixes-copy-paste-error-for-check.patch b/0005-fips-fixes-copy-paste-error-for-check.patch
index 100e307..386a067 100644
--- a/0005-fips-fixes-copy-paste-error-for-check.patch
+++ b/0005-fips-fixes-copy-paste-error-for-check.patch
@@ -1,7 +1,7 @@
From 6532fb25b7b145a5abd13ef724118b672d10482d Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Fri, 18 Jun 2010 12:52:52 +0200
-Subject: [PATCH 05/10] fips: fixes copy&paste error for "check"
+Subject: [PATCH] fips: fixes copy&paste error for "check"
---
modules.d/01fips/check | 16 +---------------
@@ -32,6 +32,3 @@ index e5cd87e..9d8d2e6 100755
+[[ $1 = -d ]] && exit 0
exit 255
---
-1.7.3.1
-
diff --git a/0006-crypt-add-fpu-kernel-module.patch b/0006-crypt-add-fpu-kernel-module.patch
index 2670f7d..46d51e6 100644
--- a/0006-crypt-add-fpu-kernel-module.patch
+++ b/0006-crypt-add-fpu-kernel-module.patch
@@ -1,7 +1,7 @@
From b32c7fc8a470687262e6c5ed379aa8895a29e02b Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Mon, 21 Jun 2010 20:47:01 +0200
-Subject: [PATCH 06/10] crypt: add fpu kernel module
+Subject: [PATCH] crypt: add fpu kernel module
---
modules.d/90crypt/installkernel | 2 +-
@@ -16,6 +16,3 @@ index f61f501..de154a5 100755
-instmods dm_crypt cbc sha256 xts aes aes_generic aesni-intel aes-x86_64
+instmods dm_crypt cbc sha256 xts aes aes_generic aesni-intel aes-x86_64 fpu
---
-1.7.3.1
-
diff --git a/0007-Write-rules-for-symlinks-to-dev-.udev-rules.d-for-la.patch b/0007-Write-rules-for-symlinks-to-dev-.udev-rules.d-for-la.patch
index c1006ef..1c7618a 100644
--- a/0007-Write-rules-for-symlinks-to-dev-.udev-rules.d-for-la.patch
+++ b/0007-Write-rules-for-symlinks-to-dev-.udev-rules.d-for-la.patch
@@ -1,7 +1,7 @@
From 840a9e7a21ea56692a2e69f049daf354d9ecd9a2 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Tue, 22 Jun 2010 10:30:39 +0200
-Subject: [PATCH 07/10] Write rules for symlinks to /dev/.udev/rules.d for later usage
+Subject: [PATCH] Write rules for symlinks to /dev/.udev/rules.d for later usage
We want some symlinks to persist in the real root, so we write them to
/dev/.udev/rules.d, that they survive a retrigger.
@@ -94,6 +94,3 @@ index 1b650f8..80e0c4c 100755
printf '[ -e "%s" ] && { ln -s "%s" /dev/root 2>/dev/null; rm "$job"; }\n' \
"${root#block:}" "${root#block:}" >> /initqueue-settled/blocksymlink.sh
---
-1.7.3.1
-
diff --git a/0008-dracut-functions-set-LANG-C-for-ldd-output-parsing.patch b/0008-dracut-functions-set-LANG-C-for-ldd-output-parsing.patch
index 0210cc8..1e8ccf9 100644
--- a/0008-dracut-functions-set-LANG-C-for-ldd-output-parsing.patch
+++ b/0008-dracut-functions-set-LANG-C-for-ldd-output-parsing.patch
@@ -1,7 +1,7 @@
From a3f3f9e0553d48013b1c88c594678be412763c48 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Tue, 22 Jun 2010 10:32:25 +0200
-Subject: [PATCH 08/10] dracut-functions: set LANG=C for ldd output parsing
+Subject: [PATCH] dracut-functions: set LANG=C for ldd output parsing
---
dracut-functions | 2 +-
@@ -20,6 +20,3 @@ index 58f119f..57dd702 100755
[[ $line = 'not a dynamic executable' ]] && return 1
if [[ $line =~ not\ found ]]; then
derror "Missing a shared library required by $bin."
---
-1.7.3.1
-
diff --git a/0009-dracut-functions-use-LC_ALL-C-rather-than-LANG-C.patch b/0009-dracut-functions-use-LC_ALL-C-rather-than-LANG-C.patch
index e0ba2a4..72c0ebe 100644
--- a/0009-dracut-functions-use-LC_ALL-C-rather-than-LANG-C.patch
+++ b/0009-dracut-functions-use-LC_ALL-C-rather-than-LANG-C.patch
@@ -1,7 +1,7 @@
From d393f8c8d8e132d4a09e0d28b2882cd321a75798 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Tue, 22 Jun 2010 11:59:49 +0200
-Subject: [PATCH 09/10] dracut-functions: use LC_ALL=C rather than LANG=C
+Subject: [PATCH] dracut-functions: use LC_ALL=C rather than LANG=C
---
dracut-functions | 2 +-
@@ -20,6 +20,3 @@ index 57dd702..2cd573a 100755
[[ $line = 'not a dynamic executable' ]] && return 1
if [[ $line =~ not\ found ]]; then
derror "Missing a shared library required by $bin."
---
-1.7.3.1
-
diff --git a/0010-mknod-with-mode-and-set-umask-for-the-rest.patch b/0010-mknod-with-mode-and-set-umask-for-the-rest.patch
index bf348c7..dd49396 100644
--- a/0010-mknod-with-mode-and-set-umask-for-the-rest.patch
+++ b/0010-mknod-with-mode-and-set-umask-for-the-rest.patch
@@ -1,7 +1,7 @@
From 581dd3a7a396eeef865cac3b6924df31a1acd62d Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Fri, 23 Jul 2010 11:17:19 +0200
-Subject: [PATCH 10/10] mknod with mode and set umask for the rest
+Subject: [PATCH] mknod with mode and set umask for the rest
---
modules.d/50plymouth/plymouth-pretrigger.sh | 12 +++++++-----
@@ -71,6 +71,3 @@ index 45033af..8938dfb 100755
fi
fi
---
-1.7.3.1
-
diff --git a/0011-base-init-do-not-set-umask.patch b/0011-base-init-do-not-set-umask.patch
index f3cda9a..fadfbeb 100644
--- a/0011-base-init-do-not-set-umask.patch
+++ b/0011-base-init-do-not-set-umask.patch
@@ -1,7 +1,7 @@
From c9fc9b8290e66435b2721d33146583f35db6bfca Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Wed, 17 Nov 2010 17:37:22 +0100
-Subject: [PATCH 11/11] base/init: do not set umask
+Subject: [PATCH] base/init: do not set umask
somehow /dev/dri gets created with the wrong permissions
https://bugzilla.redhat.com/show_bug.cgi?id=626559
@@ -22,6 +22,3 @@ index 8938dfb..2f884c3 100755
RDDEBUG=""
. /lib/dracut-lib.sh
---
-1.7.3.1
-
diff --git a/0012-plymouth-depend-on-crypt-if-cryptsetup-exists.patch b/0012-plymouth-depend-on-crypt-if-cryptsetup-exists.patch
new file mode 100644
index 0000000..0391f21
--- /dev/null
+++ b/0012-plymouth-depend-on-crypt-if-cryptsetup-exists.patch
@@ -0,0 +1,18 @@
+From 21d60c38b40f9b35dde8f33e110bd540c32cfff1 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Fri, 9 Jul 2010 11:19:32 +0200
+Subject: [PATCH] plymouth: depend on crypt, if cryptsetup exists
+
+---
+ modules.d/50plymouth/check | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/modules.d/50plymouth/check b/modules.d/50plymouth/check
+index 838e7e2..ceb26a7 100755
+--- a/modules.d/50plymouth/check
++++ b/modules.d/50plymouth/check
+@@ -1,3 +1,3 @@
+ #!/bin/bash
+-[[ $1 = -d ]] && echo crypt
++[[ $1 = -d ]] && which cryptsetup &>/dev/null && echo crypt
+ [[ -x /sbin/plymouthd && -x /bin/plymouth && -x /usr/sbin/plymouth-set-default-theme ]]
diff --git a/0013-crypt-depend-on-dm.patch b/0013-crypt-depend-on-dm.patch
new file mode 100644
index 0000000..62a09b6
--- /dev/null
+++ b/0013-crypt-depend-on-dm.patch
@@ -0,0 +1,22 @@
+From 3b005dfcce52261fbd68b9298b850f88dc9713b4 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Mon, 9 Aug 2010 13:24:08 +0200
+Subject: [PATCH] crypt: depend on dm
+
+---
+ modules.d/90crypt/check | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/modules.d/90crypt/check b/modules.d/90crypt/check
+index 852695b..a34a05e 100755
+--- a/modules.d/90crypt/check
++++ b/modules.d/90crypt/check
+@@ -3,6 +3,8 @@
+ # if cryptsetup is not installed, then we cannot support encrypted devices.
+ which cryptsetup >/dev/null 2>&1 || exit 1
+
++[ "$1" = "-d" ] && echo dm
++
+ # hostonly checking should only return true if root is on a LUKS device
+ # in some way, but I am too lazy to figure out how to do that.
+ # Instead, fail if we do not have a LUKS device in use somewhere.
diff --git a/0014-dmsquash-live-depend-on-dm-module.patch b/0014-dmsquash-live-depend-on-dm-module.patch
new file mode 100644
index 0000000..7d64ddf
--- /dev/null
+++ b/0014-dmsquash-live-depend-on-dm-module.patch
@@ -0,0 +1,25 @@
+From 1658b392d7988c685f875ae885c795196c0cb14f Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Thu, 8 Jul 2010 16:14:55 +0200
+Subject: [PATCH] dmsquash-live: depend on dm module
+
+---
+ modules.d/90dmsquash-live/check | 5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/modules.d/90dmsquash-live/check b/modules.d/90dmsquash-live/check
+index 54e5007..ae7306e 100755
+--- a/modules.d/90dmsquash-live/check
++++ b/modules.d/90dmsquash-live/check
+@@ -2,7 +2,10 @@
+
+ # if dmsetup is not installed, then we cannot support fedora/red hat
+ # style live images
+-which dmsetup >/dev/null 2>&1 || exit 1
++if [ "$1" = "-d" ]; then
++ echo dm
++ exit 0
++fi
+
+ # a live host-only image doesn't really make a lot of sense
+ if [ "$1" = "-h" ] ; then
diff --git a/0015-dm-install-install-dmeventd-only-if-present.patch b/0015-dm-install-install-dmeventd-only-if-present.patch
new file mode 100644
index 0000000..5d05ffb
--- /dev/null
+++ b/0015-dm-install-install-dmeventd-only-if-present.patch
@@ -0,0 +1,20 @@
+From 401bceaf9f54316d56583c2fa887534bb3801bb2 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Wed, 10 Nov 2010 15:00:01 +0100
+Subject: [PATCH] dm/install: install dmeventd, only if present
+
+---
+ modules.d/90dm/install | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/modules.d/90dm/install b/modules.d/90dm/install
+index f77d945..d8bb2d0 100755
+--- a/modules.d/90dm/install
++++ b/modules.d/90dm/install
+@@ -5,5 +5,5 @@ modinfo -k $kernel dm_mod >/dev/null 2>&1 && \
+
+ inst dmsetup
+
+-inst dmeventd
++type -P dmeventd >/dev/null && dracut_install dmeventd
+ inst_rules 10-dm.rules 95-dm-notify.rules
diff --git a/0016-suppress-modprobe-errors-on-builtins-credits-to-Kay-.patch b/0016-suppress-modprobe-errors-on-builtins-credits-to-Kay-.patch
new file mode 100644
index 0000000..2e89122
--- /dev/null
+++ b/0016-suppress-modprobe-errors-on-builtins-credits-to-Kay-.patch
@@ -0,0 +1,23 @@
+From af43d6cb00606dbdbd4870e715916b345086b3ef Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe at aidecoe.name>
+Date: Wed, 13 Oct 2010 19:39:14 +0200
+Subject: [PATCH] suppress modprobe errors on builtins (credits to Kay Sievers)
+
+Install /lib/modules/$kv/modules.builtin.bin to suppress modprobe error
+messages saying module was not found, while it's built-in.
+
+Credits go to Kay Sievers who enlighten us about meaning of this cool
+file.
+---
+ modules.d/90kernel-modules/install | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/modules.d/90kernel-modules/install b/modules.d/90kernel-modules/install
+index 2f19d0c..05819f5 100755
+--- a/modules.d/90kernel-modules/install
++++ b/modules.d/90kernel-modules/install
+@@ -2,3 +2,4 @@
+ [ -f /etc/modprobe.conf ] && dracut_install /etc/modprobe.conf
+ dracut_install $(find /etc/modprobe.d/ -type f -name '*.conf')
+ inst_hook cmdline 01 "$moddir/parse-kernel.sh"
++inst "$srcmods/modules.builtin.bin"
diff --git a/0017-dracut-functions-filter_kernel_modules-search-in-ext.patch b/0017-dracut-functions-filter_kernel_modules-search-in-ext.patch
new file mode 100644
index 0000000..4caaad6
--- /dev/null
+++ b/0017-dracut-functions-filter_kernel_modules-search-in-ext.patch
@@ -0,0 +1,24 @@
+From 9de9617826c444caf7f7b38cf07c7013776b2f7a Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Tue, 10 Aug 2010 15:54:03 +0200
+Subject: [PATCH] dracut-functions: filter_kernel_modules() search in extra dirs
+
+search also in "extra" and "weak-updates" for kernel modules
+https://bugzilla.redhat.com/show_bug.cgi?id=622641
+---
+ dracut-functions | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/dracut-functions b/dracut-functions
+index 2cd573a..33cb483 100755
+--- a/dracut-functions
++++ b/dracut-functions
+@@ -493,7 +493,7 @@ for_each_kmod_dep() {
+ # This function returns the full filenames of modules that match $1
+ filter_kernel_modules () (
+ if ! [[ $hostonly ]]; then
+- filtercmd='find "$srcmods/kernel/drivers" -name "*.ko" -o -name "*.ko.gz"'
++ filtercmd='find "$srcmods/kernel/drivers" "$srcmods/extra" "$srcmods/weak-updates" -name "*.ko" -o -name "*.ko.gz" 2>/dev/null'
+ else
+ filtercmd='cut -d " " -f 1 </proc/modules|xargs modinfo -F filename -k $kernel'
+ fi
diff --git a/0018-dracut-functions-suppress-modinfo-errors-for-hostonl.patch b/0018-dracut-functions-suppress-modinfo-errors-for-hostonl.patch
new file mode 100644
index 0000000..45b7457
--- /dev/null
+++ b/0018-dracut-functions-suppress-modinfo-errors-for-hostonl.patch
@@ -0,0 +1,22 @@
+From 561c2346e8d376d8deaf8e35b4250c5a5b88d61b Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Wed, 27 Oct 2010 11:19:27 +0200
+Subject: [PATCH] dracut-functions: suppress modinfo errors for hostonly mode
+
+---
+ dracut-functions | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/dracut-functions b/dracut-functions
+index 33cb483..12e78af 100755
+--- a/dracut-functions
++++ b/dracut-functions
+@@ -495,7 +495,7 @@ filter_kernel_modules () (
+ if ! [[ $hostonly ]]; then
+ filtercmd='find "$srcmods/kernel/drivers" "$srcmods/extra" "$srcmods/weak-updates" -name "*.ko" -o -name "*.ko.gz" 2>/dev/null'
+ else
+- filtercmd='cut -d " " -f 1 </proc/modules|xargs modinfo -F filename -k $kernel'
++ filtercmd='cut -d " " -f 1 </proc/modules|xargs modinfo -F filename -k $kernel 2>/dev/null'
+ fi
+ for modname in $(eval $filtercmd); do
+ case $modname in
diff --git a/0019-dracut.spec-requires-bin-mount-instead-of-mount.patch b/0019-dracut.spec-requires-bin-mount-instead-of-mount.patch
new file mode 100644
index 0000000..0aef872
--- /dev/null
+++ b/0019-dracut.spec-requires-bin-mount-instead-of-mount.patch
@@ -0,0 +1,22 @@
+From ace2cd892d0457256f688c1ee72ff3fe43b859e5 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Mon, 17 Jan 2011 11:13:39 +0100
+Subject: [PATCH] dracut.spec: requires "/bin/mount" instead of "mount"
+
+---
+ dracut.spec | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/dracut.spec b/dracut.spec
+index e1b87fa..1a82765 100644
+--- a/dracut.spec
++++ b/dracut.spec
+@@ -54,7 +54,7 @@ Requires: initscripts >= 8.63-1
+ Requires: kbd
+ Requires: mktemp >= 1.5-5
+ Requires: module-init-tools >= 3.7-9
+-Requires: mount
++Requires: /bin/mount
+ Requires: plymouth >= 0.8.0-0.2009.29.09.19.1
+ Requires: sed
+ Requires: tar
diff --git a/dracut.spec b/dracut.spec
index 6a0341a..4af8000 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -20,7 +20,7 @@
Name: dracut
Version: 006
-Release: 5%{?rdist}
+Release: 6%{?rdist}
Summary: Initramfs generator using udev
Group: System Environment/Base
License: GPLv2+
@@ -40,6 +40,14 @@ Patch8: 0008-dracut-functions-set-LANG-C-for-ldd-output-parsing.patch
Patch9: 0009-dracut-functions-use-LC_ALL-C-rather-than-LANG-C.patch
Patch10: 0010-mknod-with-mode-and-set-umask-for-the-rest.patch
Patch11: 0011-base-init-do-not-set-umask.patch
+Patch12: 0012-plymouth-depend-on-crypt-if-cryptsetup-exists.patch
+Patch13: 0013-crypt-depend-on-dm.patch
+Patch14: 0014-dmsquash-live-depend-on-dm-module.patch
+Patch15: 0015-dm-install-install-dmeventd-only-if-present.patch
+Patch16: 0016-suppress-modprobe-errors-on-builtins-credits-to-Kay-.patch
+Patch17: 0017-dracut-functions-filter_kernel_modules-search-in-ext.patch
+Patch18: 0018-dracut-functions-suppress-modinfo-errors-for-hostonl.patch
+Patch19: 0019-dracut.spec-requires-bin-mount-instead-of-mount.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -67,7 +75,6 @@ Requires: initscripts >= 8.63-1
Requires: kbd
Requires: mktemp >= 1.5-5
Requires: module-init-tools >= 3.7-9
-Requires: mount
Requires: plymouth >= 0.8.0-0.2009.29.09.19.1
Requires: sed
Requires: tar
@@ -139,17 +146,25 @@ This package contains tools to assemble the local initrd and host configuration.
%prep
%setup -q -n %{name}-%{version}%{?dashgittag}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
%build
make WITH_SWITCH_ROOT=0%{?with_switch_root}
@@ -254,6 +269,19 @@ rm -rf $RPM_BUILD_ROOT
%dir /var/lib/dracut/overlay
%changelog
+* Tue Jan 18 2011 Harald Hoyer <harald at redhat.com> 006-6
+- removed patch backup files
+- removed mount requirement, because mount is part of
+ util-linux-ng
+- patch for 642617 got lost
+Resolves: rhbz#642617 rhbz#665359
+- fixed minimal install + dm-crypt - LVM
+Resolves: rhbz#649743
+- supress warnings about nonexistant modules for custom kernels
+Resolves: rhbz#645551
+- search also in "extra" and "weak-updates" for kernel modules
+Resolves: rhbz#622888
+
* Mon Nov 22 2010 Harald Hoyer <harald at redhat.com> 006-5
- removed umask
Resolves: rhbz#655345 rhbz#655472 rhbz#654935
More information about the scm-commits
mailing list