back out previous commit

2 files changed, 1 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index ff3c107..6ad8947 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,9 +3,6 @@
 # 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 1f9372e..66130ae 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -858,7 +858,7 @@ rundebugshell() {
 
 swsusp_resume() {
 	# determine swap resume partition
-	local device=$(get_real_filename "${REAL_RESUME}")
+	local device=$(ls -lL "${REAL_RESUME}" | sed 's/\  */ /g' | cut -d \  -f 5-6 | sed 's/,\ */:/')
 	[ -f /sys/power/resume ] && echo "${device}" > /sys/power/resume
 	return 0
 }
@@ -987,13 +987,3 @@ 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
-}