SVN: geninitrd/trunk/mod-suspend.sh

[glen]

Author: glen
Date: Fri Apr  3 01:36:05 2009
New Revision: 10300

Modified:
   geninitrd/trunk/mod-suspend.sh
Log:
- support resume from initrd_dir

Modified: geninitrd/trunk/mod-suspend.sh
==============================================================================
--- geninitrd/trunk/mod-suspend.sh	(original)
+++ geninitrd/trunk/mod-suspend.sh	Fri Apr  3 01:36:05 2009
@@ -15,14 +15,19 @@
 	if is_yes "$USE_SUSPEND" && is_yes "$USE_TUXONICE"; then
 		warn "Tuxonice and mainline suspend are exclusive!"
 	fi
+
+	resume=$(find_tool $initrd_dir/resume /usr/${_lib}/suspend/resume /usr/sbin/resume)
+
+	if [ -x "$resume" -a -f /etc/suspend.conf ]; then
+		USE_SUSPEND=yes
+	else
+		USE_SUSPEND=no
+	fi
 }
 
 # find modules for for suspend
 # @access	public
 find_modules_suspend() {
-	if [ ! -x /usr/${_lib}/suspend/resume -a ! -x /usr/sbin/resume ]; then
-		die "/usr/${_lib}/suspend/resume is missing!"
-	fi
 	resume_dev="$(awk '/^resume device =/ { print $4 } ' /etc/suspend.conf)"
 
 	local vgvolumes=$VGVOLUMES