Applied patch for UUID support for real_resume= from gentoo bug #239687

cleanup-cruft
Andrew Gaffney 16 years ago
parent 8de7311644
commit a4d6260dd0

@ -2,6 +2,9 @@
# Copyright 1999-2008 Gentoo Foundation; 2008 Chris Gianelloni, Andrew Gaffney # Copyright 1999-2008 Gentoo Foundation; 2008 Chris Gianelloni, Andrew Gaffney
# Distributed under the GPL v2 # Distributed under the GPL v2
15 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> defaults/linuxrc:
Applied patch for UUID support for real_resume= from gentoo bug #239687
15 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> gen_determineargs.sh: 15 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> gen_determineargs.sh:
Added modified version of patch from gentoo bug #238707 Added modified version of patch from gentoo bug #238707

@ -273,6 +273,34 @@ then
startLUKS startLUKS
if [ "${NORESUME}" != '1' ] && [ -n "${REAL_RESUME}" ] if [ "${NORESUME}" != '1' ] && [ -n "${REAL_RESUME}" ]
then then
case "${REAL_RESUME}" in
LABEL\=*|UUID\=*)
RESUME_DEV=""
retval=1
if [ "${retval}" -ne '0' ]; then
RESUME_DEV=`findfs "${REAL_RESUME}" 2>/dev/null`
retval=$?
fi
if [ "$retval" -ne '0' ]; then
RESUME_DEV=`busybox findfs "${REAL_RESUME}" 2>/dev/null`
retval=$?
fi
if [ "${retval}" -ne '0' ]; then
RESUME_DEV=`blkid -t "${REAL_RESUME}" | cut -d ":" -f 1 2>/dev/null`
retval=$?
fi
if [ "${retval}" -eq '0' ] && [ -n "${RESUME_DEV}" ]; then
good_msg "Detected real_resume=${RESUME_DEV}"
REAL_RESUME="${RESUME_DEV}"
fi
;;
esac
swsusp_resume swsusp_resume
# suspend_resume # suspend_resume
tuxonice_resume tuxonice_resume

Loading…
Cancel
Save