From: Andrew Gaffney <agaffney@gentoo.org>
Date: Sun, 19 Jul 2009 19:47:05 +0000 (-0500)
Subject: Alternative solution for Gentoo bug #269603
X-Git-Tag: v3.4.10.906~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f3ae1fe692fed337e1765e2c76ddb12f349817c5;p=genkernel.git

Alternative solution for Gentoo bug #269603
---

diff --git a/ChangeLog b/ChangeLog
index 6ad8947..ff3c107 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS)
 # Distributed under the GPL v2
 
+  19 Jul 2009; Andrew Gaffney <agaffney@gentoo.org> defaults/initrd.scripts:
+  Alternative solution for Gentoo bug #269603
+
   19 Jul 2009; Andrew Gaffney <agaffney@gentoo.org> defaults/initrd.scripts:
   Change command used to determine real filename for REAL_RESUME for Gentoo
   bug #269603
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 66130ae..1f9372e 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -858,7 +858,7 @@ rundebugshell() {
 
 swsusp_resume() {
 	# determine swap resume partition
-	local device=$(ls -lL "${REAL_RESUME}" | sed 's/\  */ /g' | cut -d \  -f 5-6 | sed 's/,\ */:/')
+	local device=$(get_real_filename "${REAL_RESUME}")
 	[ -f /sys/power/resume ] && echo "${device}" > /sys/power/resume
 	return 0
 }
@@ -987,3 +987,13 @@ setup_unionfs() {
 		USE_UNIONFS_NORMAL=0
 	fi
 }
+
+get_real_filename() {
+	local file=$1
+
+	if [ -L "${file}" ]; then
+		readlink ${file}
+	elif [ -f "${file}" ]; then
+		echo "${file}"
+	fi
+}