[dracut/f17] dracut-018-95.git20120720

[Harald Hoyer]

commit e293e004cf34ad1585adfe3cd95a16ebece64146
Author: Harald Hoyer <harald at redhat.com>
Date:   Fri Jul 20 14:56:38 2012 +0200

    dracut-018-95.git20120720
    
    - fixed some more race condition in resume

 0093-Makefile-set-LC_MESSAGES-C-.-not-LANG.patch   |   22 ++++++++++
 ...ove-resume-in-the-initqueue-finished-hook.patch |   45 ++++++++++++++++++++
 dracut.spec                                        |    7 +++-
 3 files changed, 73 insertions(+), 1 deletions(-)
---
diff --git a/0093-Makefile-set-LC_MESSAGES-C-.-not-LANG.patch b/0093-Makefile-set-LC_MESSAGES-C-.-not-LANG.patch
new file mode 100644
index 0000000..0d42cc1
--- /dev/null
+++ b/0093-Makefile-set-LC_MESSAGES-C-.-not-LANG.patch
@@ -0,0 +1,22 @@
+From cd7fdbdb7c388a066ae5109105e72f06d5d912bc Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Thu, 19 Jul 2012 13:34:51 +0200
+Subject: [PATCH] Makefile: set LC_MESSAGES=C ... not LANG
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index bf51b51..ea34653 100644
+--- a/Makefile
++++ b/Makefile
+@@ -87,7 +87,7 @@ dracut-$(VERSION).tar.bz2: doc
+ rpm: dracut-$(VERSION).tar.bz2
+ 	rpmbuild=$$(mktemp -d -t rpmbuild-dracut.XXXXXX); src=$$(pwd); \
+ 	cp dracut-$(VERSION).tar.bz2 "$$rpmbuild"; \
+-	LANG=C $$src/git2spec.pl $(VERSION) "$$rpmbuild" < dracut.spec > $$rpmbuild/dracut.spec; \
++	LC_MESSAGES=C $$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; ) && \
diff --git a/0094-resume-move-resume-in-the-initqueue-finished-hook.patch b/0094-resume-move-resume-in-the-initqueue-finished-hook.patch
new file mode 100644
index 0000000..2176007
--- /dev/null
+++ b/0094-resume-move-resume-in-the-initqueue-finished-hook.patch
@@ -0,0 +1,45 @@
+From d35d1bbab3674a9056b76e1d3ccf479f16abaae5 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Fri, 20 Jul 2012 14:44:12 +0200
+Subject: [PATCH] resume: move resume in the initqueue/finished hook
+
+this ensures, that resume is called as soon as possible
+---
+ modules.d/95resume/resume-genrules.sh | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/modules.d/95resume/resume-genrules.sh b/modules.d/95resume/resume-genrules.sh
+index 34511d7..f16df8c 100755
+--- a/modules.d/95resume/resume-genrules.sh
++++ b/modules.d/95resume/resume-genrules.sh
+@@ -21,14 +21,14 @@ if [ -n "$resume" ]; then
+ 
+     {
+         if [ -x /usr/sbin/resume ]; then
+-            printf "KERNEL==\"%s\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\", RUN+=\"/sbin/initqueue /usr/sbin/resume %s '%s'\"\n" \
++            printf "KERNEL==\"%s\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\", RUN+=\"/sbin/initqueue --finished --unique --name 00resume /usr/sbin/resume %s \'%s\'\"\n" \
+                 ${resume#/dev/} "$a_splash" "$resume";
+-            printf "SYMLINK==\"%s\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\", RUN+=\"/sbin/initqueue /usr/sbin/resume %s '%s'\"\n" \
++            printf "SYMLINK==\"%s\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\", RUN+=\"/sbin/initqueue --finished --unique --name 00resume /usr/sbin/resume %s \'%s\'\"\n" \
+                 ${resume#/dev/} "$a_splash" "$resume";
+         fi
+-        printf "KERNEL==\"%s\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\", RUN+=\"/sbin/initqueue /bin/sh -c 'echo %%M:%%m > /sys/power/resume'\"\n" \
++        printf "KERNEL==\"%s\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\", RUN+=\"/sbin/initqueue --finished --unique --name 00resume echo %%M:%%m > /sys/power/resume\"\n" \
+             ${resume#/dev/};
+-        printf "SYMLINK==\"%s\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\", RUN+=\"/sbin/initqueue /bin/sh -c 'echo %%M:%%m > /sys/power/resume'\"\n" \
++        printf "SYMLINK==\"%s\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\", RUN+=\"/sbin/initqueue --finished --unique --name 00resume echo %%M:%%m  > /sys/power/resume\"\n" \
+             ${resume#/dev/};
+     } >> /etc/udev/rules.d/99-resume.rules
+ 
+@@ -43,9 +43,9 @@ if [ -n "$resume" ]; then
+ elif ! getarg noresume; then
+     {
+         if [ -x /usr/sbin/resume ]; then
+-            printf "SUBSYSTEM==\"block\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\", RUN+=\"/sbin/initqueue /usr/sbin/resume %s '\$tempnode'\"\n" "$a_splash"
++            printf "SUBSYSTEM==\"block\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\", RUN+=\"/sbin/initqueue --finished --unique --name 00resume /usr/sbin/resume %s \$tempnode\"\n" "$a_splash"
+         fi
+         echo "SUBSYSTEM==\"block\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\"," \
+-            " RUN+=\"/sbin/initqueue /bin/sh -c 'echo %M:%m > /sys/power/resume'\"";
++            " RUN+=\"/sbin/initqueue --finished --unique --name 00resume echo %M:%m > /sys/power/resume\"";
+     } >> /etc/udev/rules.d/99-resume.rules
+ fi
diff --git a/dracut.spec b/dracut.spec
index ff36f7c..a4a9f3e 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -10,7 +10,7 @@
 
 Name: dracut
 Version: 018
-Release: 93.git20120719%{?dist}
+Release: 95.git20120720%{?dist}
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora} || 0%{?rhel}
@@ -116,6 +116,8 @@ Patch89: 0089-resume-move-resume-process-to-initqueue.patch
 Patch90: 0090-kernel-modules-module-setup.sh-also-install-lib-modp.patch
 Patch91: 0091-nfs-install-modprobe-config-file.patch
 Patch92: 0092-udev-rules-module-setup.sh-cope-with-systemd-udevd.patch
+Patch93: 0093-Makefile-set-LC_MESSAGES-C-.-not-LANG.patch
+Patch94: 0094-resume-move-resume-in-the-initqueue-finished-hook.patch
 
 
 BuildArch: noarch
@@ -431,6 +433,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Fri Jul 20 2012 Harald Hoyer <harald at redhat.com> 018-95.git20120720
+- fixed some more race condition in resume
+
 * Thu Jul 19 2012 Harald Hoyer <harald at redhat.com> 018-93.git20120719
 - do not rename network interfaces
 - wait until md raids are clean on shutdown