diff options
| author | Britney Fransen <brfransen@gmail.com> | 2016-05-16 16:24:28 (GMT) |
|---|---|---|
| committer | Britney Fransen <brfransen@gmail.com> | 2016-05-16 16:24:28 (GMT) |
| commit | fff4c50d3a1d94c807604d6c21355993dfb95c85 (patch) | |
| tree | 390f0eb0781b2599449edbdafbeb6aaba34200dc /abs/core/runit-scripts/runitscripts/services/frontend | |
| parent | 8de064f6e96f960cdbfe6868d9957a4613f704df (diff) | |
| parent | 6f7a84649ef75069cc4fa06fabeb63e762e049d1 (diff) | |
| download | linhes_pkgbuild-fff4c50d3a1d94c807604d6c21355993dfb95c85.zip linhes_pkgbuild-fff4c50d3a1d94c807604d6c21355993dfb95c85.tar.gz linhes_pkgbuild-fff4c50d3a1d94c807604d6c21355993dfb95c85.tar.bz2 | |
Merge branch 'testing'
Diffstat (limited to 'abs/core/runit-scripts/runitscripts/services/frontend')
| -rwxr-xr-x | abs/core/runit-scripts/runitscripts/services/frontend/finish | 51 | ||||
| -rwxr-xr-x | abs/core/runit-scripts/runitscripts/services/frontend/run | 4 |
2 files changed, 34 insertions, 21 deletions
diff --git a/abs/core/runit-scripts/runitscripts/services/frontend/finish b/abs/core/runit-scripts/runitscripts/services/frontend/finish index d96bcf0..6bc324d 100755 --- a/abs/core/runit-scripts/runitscripts/services/frontend/finish +++ b/abs/core/runit-scripts/runitscripts/services/frontend/finish @@ -11,7 +11,8 @@ function cleanup(){ #continue plymouthd that was stopped in /etc/X11/Sessions/Linhes pidfile=/run/plymouth.pid -if [ -e "$pidfile" ]; then +if [ -e "$pidfile" ]; +then plypid=`cat "$pidfile"` if [ -n "$plypid" ]; then kill -s CONT "$plypid" @@ -20,34 +21,46 @@ fi grep -q nox /proc/cmdline STATUS=$? - if [ $STATUS = 0 ] - then - printhl " status = 0" - chvt 2 +if [ $STATUS = 0 ] +then + printhl " status = 0: no X" + chvt 2 else - pkill -f "X :0" - printhl " status = 1" + x1pid=`pidof Xorg` + pkill -f "Xorg" + printhl " status = 1: X" if [ ! -d /etc/sv/frontend/.runtime ] then - mkdir -p /etc/sv/frontend/.runtime + mkdir -p /etc/sv/frontend/.runtime fi touch /etc/sv/frontend/.runtime/`date +%s` - sleep 0.2 - ps -U mythtv -ef |grep "/bin/sh /usr/bin/startx"|grep -v grep|awk ' { print $2 } '|xargs kill -9 2> /dev/null - cdate=`date` + sleep 1 + #ps -U mythtv -ef |grep "xinit /etc/X11/Sessions/LinHES"|grep -v grep|awk ' { print $2 } '|xargs kill -9 2> /dev/null + #cdate=`date` numfilestotal=`/usr/bin/file_time_offset.py -s0 -d/etc/sv/frontend/.runtime` numfilesover10secondsold=`/usr/bin/file_time_offset.py -s10 -d/etc/sv/frontend/.runtime` numfileslessthan10secondsold=$(($numfilestotal-$numfilesover10secondsold)) if [ $numfileslessthan10secondsold -gt 2 ] then - sv stop frontend - printhl " Frontend disabled, due to many restarts." - printhl " Run \"sv start frontend\" to try again" - cleanup + sv stop frontend + printhl " Frontend disabled, due to many restarts." + printhl " Run \"sv start frontend\" to try again" + cleanup else - if [ $numfilestotal -gt 10 ] - then - cleanup - fi + if [ $numfilestotal -gt 10 ] + then + cleanup + fi fi + if [[ `pidof "Xorg"` -eq $x1pid ]] + then + printhl " X $x1pid is shutting down, waiting 10 seconds" + sleep 10 + if [[ `pidof "Xorg"` -eq $x1pid ]] + then + printhl " killing X $x1pid" + kill -9 $x1pid + fi + fi + killall -9 mythfrontend fi diff --git a/abs/core/runit-scripts/runitscripts/services/frontend/run b/abs/core/runit-scripts/runitscripts/services/frontend/run index 22b65db..7a80665 100755 --- a/abs/core/runit-scripts/runitscripts/services/frontend/run +++ b/abs/core/runit-scripts/runitscripts/services/frontend/run @@ -21,5 +21,5 @@ stat_runit "Starting LinHES frontend" # fi #echo "Starting LinHES frontend" >/dev/tty1 -#exec /bin/su - mythtv -l -c /usr/LH/bin/LinHES-start -exec sudo -u mythtv -i /usr/LH/bin/LinHES-start +exec su - mythtv -l -c /usr/LH/bin/LinHES-start +#exec sudo -u mythtv -i /usr/LH/bin/LinHES-start |