diff --git a/skel-root/general/scripts/camd.init b/skel-root/general/scripts/camd.init index d59a386c..0d009383 100644 --- a/skel-root/general/scripts/camd.init +++ b/skel-root/general/scripts/camd.init @@ -5,13 +5,12 @@ # Camd-Fileflags FLAGDIR="/var/etc" F_MGCAM=".mgcamd" -F_NEWCS=".newcs" F_DOSCAM=".doscam" F_OSCAM=".oscam" F_CCCAM=".cccam" +F_OSMOD=".osmod" F_NCAM=".ncam" F_GBOX=".gbox" -F_CS2GBOX=".cs2gbox" MGCAM_Action() { @@ -41,30 +40,6 @@ MGCAM_Action() esac } -NEWCS_Action() -{ - case $1 in - "start" ) - SHOWINFO "start newcs" - /var/bin/newcs - sleep 10 - ;; - "stop" ) - SHOWINFO "stop newcs" - kill $( cat /tmp/newcs.pid ) - sleep 1 - rm -rf /tmp/cccam.info - rm -rf /tmp/ecm.info - rm -rf /tmp/pid.info - ;; - * ) - NEWCS_Action "stop" - sleep 1 - NEWCS_Action "start" - ;; - esac -} - DOSCAM_Action() { case $1 in @@ -127,6 +102,35 @@ OSCAM_Action() esac } +OSMOD_Action() +{ + case $1 in + "start" ) + SHOWINFO "start camd_datefix" + /etc/init.d/camd_datefix start osmod + SHOWINFO "start osmod" + /var/bin/osmod -b + if [ -e $FLAGDIR/$F_MGCAM ]; then + sleep 15 + fi + ;; + "stop" ) + SHOWINFO "stop camd_datefix" + /etc/init.d/camd_datefix stop osmod + SHOWINFO "stop osmod" + killall osmod + sleep 1 + rm -rf /tmp/osmod.* + rm -rf /tmp/ecm.info + ;; + * ) + OSMOD_Action "stop" + sleep 1 + OSMOD_Action "start" + ;; + esac +} + NCAM_Action() { case $1 in @@ -202,34 +206,9 @@ GBOX_Action() esac } -CS2GBOX_Action() -{ - case $1 in - "start" ) - SHOWINFO "start cs2gbox" - /var/bin/cs2gbox & - sleep 3 - ;; - "stop" ) - SHOWINFO "stop cs2gbox" - killall -9 cs2gbox - sleep 1 - rm -rf /tmp/csonline.txt - ;; - * ) - CS2GBOX_Action "stop" - sleep 1 - CS2GBOX_Action "start" - ;; - esac -} - CAMD_Action() { case $1 in - "cs2gbox") - CS2GBOX_Action $ACTION - ;; "gbox") GBOX_Action $ACTION ;; @@ -242,20 +221,16 @@ CAMD_Action() "ncam") NCAM_Action $ACTION ;; + "osmod") + OSMOD_Action $ACTION + ;; "cccam") CCCAM_Action $ACTION ;; - "newcs") - NEWCS_Action $ACTION - ;; "mgcamd") MGCAM_Action $ACTION ;; *) - if [ -e $FLAGDIR/$F_CS2GBOX ]; then - CS2GBOX_Action $ACTION - fi - if [ -e $FLAGDIR/$F_GBOX ]; then GBOX_Action $ACTION fi @@ -268,6 +243,10 @@ CAMD_Action() OSCAM_Action $ACTION fi + if [ -e $FLAGDIR/$F_OSMOD ]; then + OSMOD_Action $ACTION + fi + if [ -e $FLAGDIR/$F_NCAM ]; then NCAM_Action $ACTION fi @@ -276,10 +255,6 @@ CAMD_Action() CCCAM_Action $ACTION fi - if [ -e $FLAGDIR/$F_NEWCS ]; then - NEWCS_Action $ACTION - fi - if [ -e $FLAGDIR/$F_MGCAM ]; then MGCAM_Action $ACTION fi