From: Harald Hoyer <harald@redhat.com>
Date: Tue, 15 Sep 2009 06:56:30 +0000 (+0200)
Subject: 95resume: simplyfy rules and also recognize blkid typo
X-Git-Tag: 002~37
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2178a00eeaa50757666a661d7b4f09d28a3f3b5c;p=thirdparty%2Fdracut.git

95resume: simplyfy rules and also recognize blkid typo
---

diff --git a/modules.d/95resume/resume-genrules.sh b/modules.d/95resume/resume-genrules.sh
index 023434b8e..a00a3629b 100644
--- a/modules.d/95resume/resume-genrules.sh
+++ b/modules.d/95resume/resume-genrules.sh
@@ -1,8 +1,12 @@
 if [ -n "$resume" ]; then
     {
-    printf "KERNEL==\"%s\", RUN+=\"/bin/sh -c 'echo %%M:%%m > /sys/power/resume'\"\n" \
+    printf "KERNEL==\"%s\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\", RUN+=\"/bin/sh -c 'echo %%M:%%m > /sys/power/resume'\"\n" \
 		${resume#/dev/};
-    printf "SYMLINK==\"%s\", RUN+=\"/bin/sh -c 'echo %%M:%%m > /sys/power/resume'\"\n" \
+    printf "SYMLINK==\"%s\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\", RUN+=\"/bin/sh -c 'echo %%M:%%m > /sys/power/resume'\"\n" \
+		${resume#/dev/};
+    printf "KERNEL==\"%s\", ACTION==\"add|change\", SYMLINK+=\"/dev/resume\"\n" \
+		${resume#/dev/};
+    printf "SYMLINK==\"%s\", ACTION==\"add|change\", SYMLINK+=\"/dev/resume\"\n" \
 		${resume#/dev/};
     } >> /etc/udev/rules.d/99-resume.rules
 
@@ -13,9 +17,7 @@ if [ -n "$resume" ]; then
 
 elif  ! getarg noresume; then
     {
-    echo "SUBSYSTEM==\"block\", ACTION==\"add\", ENV{ID_FS_TYPE}==\"suspend\"," \
-         " RUN+=\"/bin/sh -c 'echo %M:%m > /sys/power/resume'\"";
-    echo "SUBSYSTEM==\"block\", ACTION==\"add\", ENV{ID_FS_TYPE}==\"swsuspend\"," \
+    echo "SUBSYSTEM==\"block\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\"," \
          " RUN+=\"/bin/sh -c 'echo %M:%m > /sys/power/resume'\"";
     } >> /etc/udev/rules.d/99-resume.rules
 fi