[meego-commits] 23942: Changes to MeeGo:1.1:Core:Update/pm-utils

[jieyang]

Hi,
I have made the following changes to pm-utils in project MeeGo:1.1:Core:Update. Please review and accept ASAP.

Thank You,
jieyang

[This message was auto-generated]

---

Request #23942:

  submit:   MeeGo:1.1:Core:Update:Testing/pm-utils(r2)(update) -> MeeGo:1.1:Core:Update/pm-utils


Message:
    forward

State:   new          2011-09-15T19:49:44 jieyang
Comment: None



changes files:
--------------
--- pm-utils.changes
+++ pm-utils.changes
@@ -0,0 +1,3 @@
+* Thu Mar 03 2011 Neo Fang <neo.fang at intel.com> - 1.3.1
+- Fix BMC#13940: Add 10-umount-SD script to umount sd card before suspend.
+

new:
----
  pm-utils-10umount-SD.patch

spec files:
-----------
--- pm-utils.spec
+++ pm-utils.spec
@@ -24,6 +24,7 @@
 
 Source23: pm-utils-bugreport-info.sh
 Patch0  : dell-1012-s3-resume-failure-workaround.patch
+Patch1  : pm-utils-10umount-SD.patch
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -47,6 +48,7 @@
 %prep
 %setup -q 
 %patch0 -p1
+%patch1 -p1
 
 
 %build

other changes:
--------------

++++++ pm-utils-10umount-SD.patch (new)
--- pm-utils-10umount-SD.patch
+++ pm-utils-10umount-SD.patch
+diff -urN pm-utils-1.3.1.orig/pm/sleep.d/10umount_SD pm-utils-1.3.1/pm/sleep.d/10umount_SD
+--- pm-utils-1.3.1.orig/pm/sleep.d/10umount_SD	1970-01-01 08:00:00.000000000 +0800
++++ pm-utils-1.3.1/pm/sleep.d/10umount_SD	2011-03-03 10:54:05.000000000 +0800
+@@ -0,0 +1,26 @@
++# Drop to: /etc/pm/sleep.d
++# Use this script to prevent data loss on mounted MMC/SD
++# cards. It syncs data and umounts all mmcblk devices prior to
++# suspend, and cancels suspend if umounting was not possible
++# (i.e: something locks a file)
++case "${1}" in
++    hibernate|suspend)
++            /bin/sync
++            for drive in $( /bin/ls /dev/mmcblk?p* ); do
++                /bin/umount ${drive} > /dev/null
++	        # If umount failed: abort suspend
++                if [ $? -gt 0 ]; then
++		# Test if device keeps mounted. Previous command could fail
++                # (i.e device was not mounted) with a non-stopper
++		# problem for the suspend process.
++		/bin/mount | /bin/grep ${drive}
++		if [ $? -eq 0 ]; then
++			exit 1
++		fi
++		fi
++	done
++	;;
++#    resume|thaw)
++##       Do nothing. All devices will be automatically mounted again.   
++#       ;;
++esac
+diff -urN pm-utils-1.3.1.orig/pm/sleep.d/Makefile.am pm-utils-1.3.1/pm/sleep.d/Makefile.am
+--- pm-utils-1.3.1.orig/pm/sleep.d/Makefile.am	2010-07-04 22:42:51.000000000 +0800
++++ pm-utils-1.3.1/pm/sleep.d/Makefile.am	2011-03-03 10:54:53.000000000 +0800
+@@ -4,6 +4,7 @@
+ 	00logging		\
+ 	00powersave		\
+ 	01grub			\
++	10umount_SD		\
+ 	49bluetooth		\
+ 	55NetworkManager	\
+ 	75modules		\
+diff -urN pm-utils-1.3.1.orig/pm/sleep.d/Makefile.in pm-utils-1.3.1/pm/sleep.d/Makefile.in
+--- pm-utils-1.3.1.orig/pm/sleep.d/Makefile.in	2010-07-04 23:01:21.000000000 +0800
++++ pm-utils-1.3.1/pm/sleep.d/Makefile.in	2011-03-03 10:55:58.000000000 +0800
+@@ -158,6 +158,7 @@
+ 	00logging		\
+ 	00powersave		\
+ 	01grub			\
++	10umount_SD		\
+ 	49bluetooth		\
+ 	55NetworkManager	\
+ 	75modules		\