From b3a2223ff84b6b0026c79a4766b2eb46324d8525 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Tue, 17 Feb 2009 22:44:45 -0600
Subject: updated soundconfig.sh to account for new way ossinfo and udevadm.

---
 abs/core-testing/LinHES-config/PKGBUILD       |  2 +-
 abs/core-testing/LinHES-config/soundconfig.sh | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD
index ede626f..073792e 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=265
 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/soundconfig.sh b/abs/core-testing/LinHES-config/soundconfig.sh
index 1adb447..5096a97 100755
--- a/abs/core-testing/LinHES-config/soundconfig.sh
+++ b/abs/core-testing/LinHES-config/soundconfig.sh
@@ -26,9 +26,9 @@ function load_alsa() {
 
     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 ]
-- 
cgit v0.12

