diff --git a/ChangeLog b/ChangeLog
index c469656..12671c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> generic/linuxrc:
+  Moving the code to start resume operations so it doesn't run when booting
+  from CD. We also don't execute the code if there's no real_resume set on the
+  command line, since it will fail, anyway, without it.
+
   02 Feb 2008; Andrew Gaffney <agaffney@gentoo.org> alpha/modules_load,
   ia64/modules_load, ppc/modules_load, ppc64/modules_load, um/modules_load,
   x86/modules_load, x86_64/modules_load, xen0/modules_load,
diff --git a/generic/linuxrc b/generic/linuxrc
index 888f6bd..381c6b5 100644
--- a/generic/linuxrc
+++ b/generic/linuxrc
@@ -262,6 +262,13 @@ startVolumes
 if [ "${CDROOT}" != 1 ]
 then
 	startLUKS
+	if [ "${NORESUME}" != '1' ] && [ -n "${REAL_RESUME}" ]
+	then
+		swsusp_resume
+#		suspend_resume
+#		suspend2_resume
+		tuxonice_resume
+	fi
 fi
 
 # Set up unionfs
@@ -278,14 +285,6 @@ fi
 # Run debug shell if requested
 rundebugshell
 
-if [ "${NORESUME}" != '1' ]
-then
-	swsusp_resume
-#	suspend_resume
-#	suspend2_resume
-	tuxonice_resume
-fi
-
 if [ "${CDROOT}" = '1' ]
 then
 	if [ ! "${USE_UNIONFS_NORMAL}" = '1' ]