resume: Ensure we remove the timout job when we find the resume device

master
Colin Guthrie 2013-01-23 20:15:03 +00:00 committed by Harald Hoyer
parent a28e2aeefe
commit 3ed09d970e
1 changed files with 2 additions and 2 deletions

View File

@ -32,8 +32,8 @@ if [ -n "$resume" ]; then
${resume#/dev/};
} >> /etc/udev/rules.d/99-resume.rules

printf '[ -e "%s" ] && { ln -s "%s" /dev/resume; rm "$job"; udevadm settle; }\n' \
"$resume" "$resume" >> $hookdir/initqueue/settled/resume.sh
printf '[ -e "%s" ] && { ln -s "%s" /dev/resume; rm "$job" "%s/initqueue/timeout/resume.sh"; }\n' \
"$resume" "$resume" "$hookdir" >> $hookdir/initqueue/settled/resume.sh

printf 'warn "Cancelling resume operation. Device not found."; cancel_wait_for_dev /dev/resume; rm "$job" "%s/initqueue/settled/resume.sh";' \
"$hookdir" >> $hookdir/initqueue/timeout/resume.sh