diff options
| author | James Meyer <james.meyer@operamail.com> | 2012-09-03 19:31:19 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2012-09-03 19:31:19 (GMT) |
| commit | 54a82868b7fa5ff72c13ea704fe3c009889384ff (patch) | |
| tree | 0214573f802399f7982d3a75a661f02ed0bffa54 /abs/core/LinHES-system | |
| parent | 39576222150a6983f7ba63ba2583c8a5e7374aab (diff) | |
| download | linhes_pkgbuild-54a82868b7fa5ff72c13ea704fe3c009889384ff.zip linhes_pkgbuild-54a82868b7fa5ff72c13ea704fe3c009889384ff.tar.gz linhes_pkgbuild-54a82868b7fa5ff72c13ea704fe3c009889384ff.tar.bz2 | |
Merge remote-tracking branch 'origin/testing' into testing
# By Britney Fransen (10) and others
# Via Britney Fransen
* origin/testing:
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/runit-scripts/PKGBUILD
Diffstat (limited to 'abs/core/LinHES-system')
| -rw-r--r-- | abs/core/LinHES-system/system.install | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/abs/core/LinHES-system/system.install b/abs/core/LinHES-system/system.install index c9950f2..7ae0616 100644 --- a/abs/core/LinHES-system/system.install +++ b/abs/core/LinHES-system/system.install @@ -51,14 +51,9 @@ grep -q "pam_limits.so" /etc/pam.d/su fi -# Update mythtv's fluxbox keys files to use the tvterm.sh script to get -# an xterm. Then signal fluxbox to re-read the keys file. - -sed -i.orig 's/^Mod1 x :.*xterm.*$/Mod1 x :ExecCommand tvterm.sh/g' \ - ~mythtv/.fluxbox/keys -pkill -HUP fluxbox - +# Add db entry for misc status in MythWeb +/usr/LH/bin/misc_status_config.py } |