From 4d81ab2da9e1bbacd0e536363f179936146b6e4f Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 12 Jun 2013 16:04:44 +0300 Subject: [PATCH] oscam: update to oscam-8695 & improve suspend/resume --- packages/addons/service/softcam/oscam/changelog.txt | 4 ++++ packages/addons/service/softcam/oscam/meta | 4 ++-- .../service/softcam/oscam/source/sleep.d/oscam.power | 8 ++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/addons/service/softcam/oscam/changelog.txt b/packages/addons/service/softcam/oscam/changelog.txt index bf831d8ce7..5cfabd511a 100644 --- a/packages/addons/service/softcam/oscam/changelog.txt +++ b/packages/addons/service/softcam/oscam/changelog.txt @@ -1,3 +1,7 @@ +3.0.12 +- update to oscam-8695 +- improve suspend/resume + 3.0.11 - update to oscam-8678 diff --git a/packages/addons/service/softcam/oscam/meta b/packages/addons/service/softcam/oscam/meta index 546432afe1..0d1509a15d 100644 --- a/packages/addons/service/softcam/oscam/meta +++ b/packages/addons/service/softcam/oscam/meta @@ -20,8 +20,8 @@ ################################################################################ PKG_NAME="oscam" -PKG_VERSION="8678" -PKG_REV="11" +PKG_VERSION="8695" +PKG_REV="12" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.streamboard.tv/oscam/wiki" diff --git a/packages/addons/service/softcam/oscam/source/sleep.d/oscam.power b/packages/addons/service/softcam/oscam/source/sleep.d/oscam.power index c2db86d947..1989f1fbe0 100644 --- a/packages/addons/service/softcam/oscam/source/sleep.d/oscam.power +++ b/packages/addons/service/softcam/oscam/source/sleep.d/oscam.power @@ -41,6 +41,14 @@ if [ "$RESTART_ON_RESUME" == "true" ] ; then thaw|resume) progress "Restarting oscam for wakeup..." if [ -f "$LOCKFILE" ] ; then + oscam.stop + for seq in `seq 1 10` ; do + if [ ! "$(pidof oscam)" ];then + break + fi + usleep 500000 + done + killall -9 oscam &>/dev/null rm -rf "$LOCKFILE" oscam.start fi