summaryrefslogtreecommitdiffstats
path: root/abs/core-testing/LinHES-config
diff options
context:
space:
mode:
authorNathan Harris <nharris@eoimaging.com>2009-02-18 19:19:39 (GMT)
committerNathan Harris <nharris@eoimaging.com>2009-02-18 19:19:39 (GMT)
commitdefa55e46b886049bd1de0fdd4cc92410b52d280 (patch)
treeba1c03edb5fa41e03cb49839648697d855a4bdf9 /abs/core-testing/LinHES-config
parent416f9c590b6de5de7eeb8eb19b26571626f35a7f (diff)
parent84249e85222f40c8b6855d9822f52d273a3d979f (diff)
downloadlinhes_pkgbuild-defa55e46b886049bd1de0fdd4cc92410b52d280.zip
linhes_pkgbuild-defa55e46b886049bd1de0fdd4cc92410b52d280.tar.gz
linhes_pkgbuild-defa55e46b886049bd1de0fdd4cc92410b52d280.tar.bz2
Merge branch 'master' of nharris@knoppmyth.net:LinHES-PKGBUILD
Diffstat (limited to 'abs/core-testing/LinHES-config')
-rwxr-xr-xabs/core-testing/LinHES-config/PKGBUILD2
-rwxr-xr-xabs/core-testing/LinHES-config/install_db_chroot.sh2
-rwxr-xr-xabs/core-testing/LinHES-config/soundconfig.sh15
3 files changed, 12 insertions, 7 deletions
diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD
index ede626f..0204d2d 100755
--- a/abs/core-testing/LinHES-config/PKGBUILD
+++ b/abs/core-testing/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=1.0
-pkgrel=263
+pkgrel=266
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev )
pkgdesc="Install and configure your system"
depends=(bc libstatgrab mysql-python expect curl dnsutils parted sg3_utils nmbscan )
diff --git a/abs/core-testing/LinHES-config/install_db_chroot.sh b/abs/core-testing/LinHES-config/install_db_chroot.sh
index 94305d2..1a0131e 100755
--- a/abs/core-testing/LinHES-config/install_db_chroot.sh
+++ b/abs/core-testing/LinHES-config/install_db_chroot.sh
@@ -30,7 +30,7 @@ do
if [ $showstatus = 0 ]
then
pacman --noconfirm -R mythdb-initial
- pacman --noconfirm -S mythdb-initial
+ pacman --noconfirm -S mythdb-initial
$MV_ROOT/bin/restore_default_settings.sh -c load
DISPLAY=127.0.0.1:0 $MV_ROOT/bin/MythVantage -t restore,default_1
$MV_ROOT/bin/restore_default_settings.sh -c restore -t syssettings
diff --git a/abs/core-testing/LinHES-config/soundconfig.sh b/abs/core-testing/LinHES-config/soundconfig.sh
index 1adb447..8985a06 100755
--- a/abs/core-testing/LinHES-config/soundconfig.sh
+++ b/abs/core-testing/LinHES-config/soundconfig.sh
@@ -21,14 +21,14 @@ function load_alsa() {
# cd /lib/modules/2.6.21-STB
KER=`uname -r`
cd /lib/modules/$KER/kernel/
- tar -xvf alsa-$KER.tar
+ tar -xvf /lib/modules/alsa-$KER.tar
pacman -Sf --noconfirm alsa-lib
depmod -a
cd -
- udevsettle
- udevsettle
- udevtrigger
+ udevadm trigger
+ udevadm settle
+ udevadm trigger
add_service.sh alsa-utils
sleep 4
@@ -57,6 +57,11 @@ function unload_oss {
function installOSS {
echo "installing oss"
+ pacman -Q oss 2>/dev/null
+ if [ ! $? = 0 ]
+ then
+ pacman --noconfirm -Sf oss
+ fi
add_service.sh oss
sleep 4
sv start oss
@@ -102,7 +107,7 @@ $MV_ROOT/bin/restore_default_settings.sh -c MUSICFRONT
function checkOSSinstalled () {
- ossinfo 1>/dev/null
+ ossinfo |grep Version |grep -q OSS >/dev/null
resultcode=$?
echo $resultcode
if [ $resultcode = 0 ]