diff options
Diffstat (limited to 'abs/core/LinHES-system/LinHES-session')
| -rwxr-xr-x | abs/core/LinHES-system/LinHES-session | 62 |
1 files changed, 37 insertions, 25 deletions
diff --git a/abs/core/LinHES-system/LinHES-session b/abs/core/LinHES-system/LinHES-session index 14606fb..ae702cf 100755 --- a/abs/core/LinHES-system/LinHES-session +++ b/abs/core/LinHES-system/LinHES-session @@ -55,13 +55,13 @@ function keylaunch(){ fi echo "Checking if keylaunch is running" - if [ "$(pidof keylaunch)" ] + if [ "$(pidof keylaunch)" ] then echo "keylaunch is already running" else echo "Starting keylaunch" /usr/bin/keylaunch & - fi + fi fi } @@ -198,7 +198,6 @@ function first_mythwelcome_config(){ function first_configure(){ - first_mythwelcome_config if [ ! x$STARTUP_STYLE = xlegacy ] then first_configure_mv @@ -209,6 +208,7 @@ function first_configure(){ function first_configure_default(){ + echo "First configure: legacy..." if [ ! $SystemType = "Frontend_only" ] then if [ -f ~/.configure ] @@ -224,19 +224,18 @@ function first_configure_default(){ else rm -f ~/.no_meth fi - - sudo sv stop mythbackend - xterm -fn *18* -e sudo taskset -c 0 /usr/bin/mythtv-setup - sudo sv start mythbackend - sudo chown -R mythtv.mythtv /home/mythtv - # only run mythfilldatabase for masterbackends - if [ $SystemType = "Master_backend" ] - then - nice -n 19 mythfilldatabase --quiet & - msg "Guide data is being loaded.\nUntil this completes\nsome shows will appear as "unknown"\nin the program guide." - fi - - rm ~/.configure + first_mythwelcome_config + sudo sv stop mythbackend + xterm -fn *18* -e sudo taskset -c 0 /usr/bin/mythtv-setup + sudo sv start mythbackend + sudo chown -R mythtv.mythtv /home/mythtv + # only run mythfilldatabase for masterbackends + if [ $SystemType = "Master_backend" ] + then + nice -n 19 mythfilldatabase --quiet & + msg "Guide data is being loaded.\nUntil this completes\nsome shows will appear as unknown\nin the program guide." + fi + rm ~/.configure fi else if [ -f ~/.configure ] @@ -248,6 +247,7 @@ function first_configure_default(){ function first_configure_mv(){ + echo "First configure..." if [ ! $SystemType = "Frontend_only" ] then if [ -f ~/.configure ] @@ -259,9 +259,10 @@ function first_configure_mv(){ #0 yes #1 yes/autodetech #2 no + first_mythwelcome_config while [ -e '/var/run/autocard.lock' ] do - msg "Waiting for capture card detection to complete" + msg "Waiting for capture card detection to complete..." sleep 5 done STATUS=$? @@ -273,13 +274,13 @@ function first_configure_mv(){ /usr/bin/taskset -c 0 /usr/bin/mythtv-setup /usr/MythVantage/bin/backend_control.sh start BE 127.0.0.1 fi - # only run mythfilldatabase for masterbackends - if [ $SystemType = "Master_backend" ] - then - nice -n 19 mythfilldatabase --quiet & - msg "Guide data is being loaded.\nUntil this completes\nsome shows will appear as "unknown"\nin the program guide." - fi - rm -f ~/.configure + # only run mythfilldatabase for masterbackends + if [ $SystemType = "Master_backend" ] + then + nice -n 19 mythfilldatabase --quiet & + msg "Guide data is being loaded.\nUntil this completes\nsome shows will appear as unknown\nin the program guide." + fi + rm -f ~/.configure fi else if [ -f ~/.configure ] @@ -317,7 +318,6 @@ function start_myth() { fi done sleep 3 #give time for MBE to be fully operational - fi #continue on with starting mythtv @@ -396,6 +396,17 @@ function set_background() } +function stop_plymouth() +{ + #pause plymouthd and continue in /etc/sv/frontend/finish + pidfile=/run/plymouth.pid + if [ -e "$pidfile" ]; then + plypid=`cat "$pidfile"` + if [ -n "$plypid" ]; then + sudo kill -s STOP "$plypid" + fi + fi +} if [ x"$WM" = "fluxbox" ] @@ -418,6 +429,7 @@ start_screensaver notify_scan & auto_start & update_apple_trailers +stop_plymouth & first_configure show_help_tip start_myth |