rpms/mkinitrd/F-11 0001-mkinitrd-move-hotplug-run-to-before-gpu-driver-probi.patch, NONE, 1.1 mkinitrd.spec, 1.325, 1.326

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/extras/rpms/mkinitrd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25322

Modified Files:
	mkinitrd.spec 
Added Files:
	0001-mkinitrd-move-hotplug-run-to-before-gpu-driver-probi.patch 
Log Message:
* Wed Sep  2 2009 Hans de Goede <hdegoede at redhat.com> - 6.0.87-4
- move hotplug run to before gpu driver probing (#520730)


0001-mkinitrd-move-hotplug-run-to-before-gpu-driver-probi.patch:
 mkinitrd |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE 0001-mkinitrd-move-hotplug-run-to-before-gpu-driver-probi.patch ---
>From 93f6828f8ef4710f1253ab246f31498c8876317d Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at linux.ie>
Date: Wed, 2 Sep 2009 12:06:25 +1000
Subject: [PATCH] mkinitrd: move hotplug run to before gpu driver probing.

---
 mkinitrd |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mkinitrd b/mkinitrd
index 457231f..9676f0a 100755
--- a/mkinitrd
+++ b/mkinitrd
@@ -1509,6 +1509,9 @@ for i in 0 1 2 3 ; do
 done
 emit "daemonize --ignore-missing /bin/plymouthd"
 
+emit "echo Setting up hotplug."
+emit "hotplug"
+
 # If we have drm loaded, include modesetting drivers
 if [ "x$PROBE" == "xyes" -a -d /sys/class/drm ]; then
     handlegraphics
@@ -1535,9 +1538,6 @@ if [ -x /usr/libexec/plymouth/plymouth-populate-initrd ]; then
     /usr/libexec/plymouth/plymouth-populate-initrd $(get_verbose) -t "$MNTIMAGE"
 fi
 
-emit "echo Setting up hotplug."
-emit "hotplug"
-
 emit "echo Creating block device nodes."
 emit "mkblkdevs"
 emit "echo Creating character device nodes."
-- 
1.6.4



Index: mkinitrd.spec
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/F-11/mkinitrd.spec,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -p -r1.325 -r1.326
--- mkinitrd.spec	27 Jul 2009 14:49:38 -0000	1.325
+++ mkinitrd.spec	2 Sep 2009 08:54:11 -0000	1.326
@@ -3,11 +3,12 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
 Version: 6.0.87
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: mkinitrd-%{version}.tar.bz2
 Patch0: mkinitrd-rh506189.patch
+Patch1: 0001-mkinitrd-move-hotplug-run-to-before-gpu-driver-probi.patch
 ExclusiveOs: Linux
 URL: git://git.fedoraproject.org/git/hosted/mkinitrd
 Requires: /bin/sh, /sbin/insmod.static, /sbin/losetup
@@ -81,6 +82,7 @@ information about the current boot envir
 %prep
 %setup -q -n mkinitrd-%{version}
 %patch0 -p1
+%patch1 -p1
 find . -name "Makefile*" -exec sed -i 's|-Werror||g' {} \;
 
 %build
@@ -139,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/kernel/prerm.d
 
 %changelog
+* Wed Sep  2 2009 Hans de Goede <hdegoede at redhat.com> - 6.0.87-4
+- move hotplug run to before gpu driver probing (#520730)
+
 * Mon Jul 27 2009 Hans de Goede <hdegoede at redhat.com> - 6.0.87-3
 - process all PVs in required VG (#506189)