From edb4961838ef76194ca2d2c8892031f1ea7e7e1f Mon Sep 17 00:00:00 2001 From: James Meyer Date: Tue, 4 Sep 2012 16:13:11 -0500 Subject: Merge remote-tracking branch 'origin/testing' into testing # By Britney Fransen (13) and others # Via Britney Fransen * origin/testing: LinHES-system: mythfrontend-start: fork start command so that mythfrontend-start will exit. closes #847 mythtv: fixed and cleaned some menus. Closes #846 v4l-dvb: fix conflicting kernel modules. refs #844 mythdb-initial: add MiscStatusScript value to initial db. refs #845. LinHES-system: remove dup .install keylaunch: update .keylaunchrc to run mythtv-setup as user rsyslog: increase log retention to 2 weeks runit-scripts: enable cron logging to syslog premake:initial inclusion. closes #801 libaacs-git:initial inclusion. closes #801 aacskeys:initial inclusion. closes #801 LinHES-system: Add scripts for misc status in MythWeb. closes #845. linhes-scripts: tweak myth2mkv. Update version to 0.25-004 dvb-firmware: add xc5000c firmware. change xc5000 modprobe options. closes #844 v4l-dvb: update to snapshot from 20120828. refs #844 LinHES-system: update myth_status.py to work with tuners in error. closes #843 curlftpfs: Initial Inclusion. linhes-scripts: minor changes to myth2mkv mythtv:Bumped to latest fixes. Added ./configure items to close #842. LinHES-config:7.4 rdt 9th anniversary release. Conflicts: abs/core/LinHES-config/LinHES-release abs/core/LinHES-config/PKGBUILD abs/core/LinHES-system/PKGBUILD abs/core/keylaunch/PKGBUILD abs/core/linhes-scripts/PKGBUILD abs/core/mythdb-initial/PKGBUILD abs/core/mythdb-initial/mc.sql abs/core/mythtv/stable-0.25/mythtv/PKGBUILD abs/core/rsyslog/PKGBUILD abs/core/runit-scripts/PKGBUILD --- abs/core/LinHES-system/mythfrontend-start | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/core/LinHES-system/mythfrontend-start b/abs/core/LinHES-system/mythfrontend-start index 1f48449..9aac881 100755 --- a/abs/core/LinHES-system/mythfrontend-start +++ b/abs/core/LinHES-system/mythfrontend-start @@ -19,11 +19,11 @@ then fi question="There $diagtext running. Do you really want to start another one?" - mythvantage -q "${question}" + mythvantage -Q "${question}" if [ $? = 16 ] then - $STARTCMD 2>&1 + $STARTCMD 2>&1 & fi else - $STARTCMD 2>&1 + $STARTCMD 2>&1 & fi -- cgit v0.12