diff options
author | Britney Fransen <brfransen@gmail.com> | 2014-10-27 20:28:27 (GMT) |
---|---|---|
committer | Britney Fransen <brfransen@gmail.com> | 2014-10-27 20:28:27 (GMT) |
commit | f7b823f55a80b1498c30e9f3a47692a2329c4f09 (patch) | |
tree | 6de557714e6336282fbc0ab16c6578386dfc6654 /abs/core/runit-scripts/runitscripts/services/frontend | |
parent | 4c2a2e3504f472628285a989c7c9a76be6855f54 (diff) | |
parent | 01c1a60f3b7f93b3ed7404196c2cf798c4d8c674 (diff) | |
download | linhes_pkgbuild-f7b823f55a80b1498c30e9f3a47692a2329c4f09.zip linhes_pkgbuild-f7b823f55a80b1498c30e9f3a47692a2329c4f09.tar.gz linhes_pkgbuild-f7b823f55a80b1498c30e9f3a47692a2329c4f09.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 | 20 | ||||
-rwxr-xr-x | abs/core/runit-scripts/runitscripts/services/frontend/run | 4 |
2 files changed, 16 insertions, 8 deletions
diff --git a/abs/core/runit-scripts/runitscripts/services/frontend/finish b/abs/core/runit-scripts/runitscripts/services/frontend/finish index 417488d..d96bcf0 100755 --- a/abs/core/runit-scripts/runitscripts/services/frontend/finish +++ b/abs/core/runit-scripts/runitscripts/services/frontend/finish @@ -1,14 +1,23 @@ -#!/bin/bash -exec 2>&1 -export TERM=linux -. /etc/rc.conf -. /etc/rc.d/functions +#!/bin/bash +exec 2>&1 +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions function cleanup(){ rm -f /etc/sv/frontend/.runtime/* printhl " Cleaning up /etc/sv/frontend/.runtime/" } +#continue plymouthd that was stopped in /etc/X11/Sessions/Linhes +pidfile=/run/plymouth.pid +if [ -e "$pidfile" ]; then + plypid=`cat "$pidfile"` + if [ -n "$plypid" ]; then + kill -s CONT "$plypid" + fi +fi + grep -q nox /proc/cmdline STATUS=$? if [ $STATUS = 0 ] @@ -42,4 +51,3 @@ else fi fi fi - diff --git a/abs/core/runit-scripts/runitscripts/services/frontend/run b/abs/core/runit-scripts/runitscripts/services/frontend/run index 3711058..22b65db 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 /bin/su - mythtv -l -c /usr/LH/bin/LinHES-start +exec sudo -u mythtv -i /usr/LH/bin/LinHES-start |