diff options
| author | James Meyer <james.meyer@operamail.com> | 2009-08-19 21:44:03 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2009-08-19 21:44:03 (GMT) |
| commit | 79daa29002e02579e84a5bb7ca895be2395a7fce (patch) | |
| tree | 402a6ba34feff4c9d144b65bfe6e6d0f16782485 | |
| parent | db90030979f646114470d9a2c6f5e394d3af181f (diff) | |
| download | linhes_pkgbuild-79daa29002e02579e84a5bb7ca895be2395a7fce.zip linhes_pkgbuild-79daa29002e02579e84a5bb7ca895be2395a7fce.tar.gz linhes_pkgbuild-79daa29002e02579e84a5bb7ca895be2395a7fce.tar.bz2 | |
Linhes-config/system: add option to stop tweaker from running.
| -rw-r--r-- | abs/core-testing/LinHES-config/PKGBUILD | 2 | ||||
| -rwxr-xr-x | abs/core-testing/LinHES-config/mv_install.py | 7 | ||||
| -rw-r--r-- | abs/core-testing/LinHES-system/LinHES-run | 13 | ||||
| -rw-r--r-- | abs/core-testing/LinHES-system/PKGBUILD | 2 |
4 files changed, 15 insertions, 9 deletions
diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD index 77b9563..ed2079d 100644 --- a/abs/core-testing/LinHES-config/PKGBUILD +++ b/abs/core-testing/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=2.0 -pkgrel=86 +pkgrel=88 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev ) pkgdesc="Install and configure your system" depends=(bc libstatgrab mysql-python expect curl dnsutils parted diff --git a/abs/core-testing/LinHES-config/mv_install.py b/abs/core-testing/LinHES-config/mv_install.py index 56118c1..7d72c22 100755 --- a/abs/core-testing/LinHES-config/mv_install.py +++ b/abs/core-testing/LinHES-config/mv_install.py @@ -844,7 +844,9 @@ def special_hardware_check(): typefile.close() except: logging.debug("Couldn't write to file: ", typefile) - + if re.match("no_meth",item) != None : + cmd = " touch %s%s/.no_meth" %(data_config.MOUNTPOINT, data_config.MYTHHOME) + runcmd(cmd) def swapsearch(): #currently unused! @@ -1038,12 +1040,11 @@ def full_install(hostoptions): cmd = "chroot %s %s/bin/restore_default_settings.sh -c ACCESSCONTROL " %(data_config.MOUNTPOINT, MVROOT) runcmd(cmd) umount_bind_chroot() - #cmd = " chroot %s %s/bin/systemconfig.sh advanced, user" %(data_config.MOUNTPOINT, MVROOT) - #runcmd(cmd) cmd = " touch %s%s/.configure" %(data_config.MOUNTPOINT, data_config.MYTHHOME) runcmd(cmd) cmd = " chmod 777 %s%s/.configure" %(data_config.MOUNTPOINT, data_config.MYTHHOME) runcmd(cmd) + msg = "Done" update_status(msg) cp_and_log("/tmp/mythvantage_install.log", data_config.MOUNTPOINT+"/var/log/mythvantage_install.log") diff --git a/abs/core-testing/LinHES-system/LinHES-run b/abs/core-testing/LinHES-system/LinHES-run index 640b2f3..1b91def 100644 --- a/abs/core-testing/LinHES-system/LinHES-run +++ b/abs/core-testing/LinHES-system/LinHES-run @@ -51,10 +51,15 @@ then if [ -f ~/.configure ] then # Run Tweaker, which applies generic and hardware-specific settings - sudo -E tweaker.pl - /bin/rm /tmp/fps # ??? clean up a temp file that will eventually be obsolete anyway - # Run any brand-specific commands, if necessary. - SpecialHardwareCommands + if [ ! -f ~/.no_meth ] + then + sudo -E tweaker.pl + /bin/rm /tmp/fps # ??? clean up a temp file that will eventually be obsolete anyway + # Run any brand-specific commands, if necessary. + SpecialHardwareCommands + 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 diff --git a/abs/core-testing/LinHES-system/PKGBUILD b/abs/core-testing/LinHES-system/PKGBUILD index aca4c13..2a10fe0 100644 --- a/abs/core-testing/LinHES-system/PKGBUILD +++ b/abs/core-testing/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=1.0 -pkgrel=64 +pkgrel=69 arch=('i686') MVDIR=$startdir/pkg/usr/LH BINDIR=$startdir/pkg/usr/bin |