From 4faaee5d40ac8b2728bf08d918179b3ce2418526 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Sat, 2 Feb 2008 18:07:46 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@584 67a159dc-881f-0410-a524-ba9dfbe2cb84 --- ChangeLog | 5 +++++ generic/linuxrc | 15 +++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) 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 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 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' ]