[arch-commits] Commit in ossp/trunk (PKGBUILD osspd.rc.d)

[Jan Steffens]

    Date: Saturday, May 28, 2011 @ 22:05:47
  Author: heftig
Revision: 125741

Simplify startup script

Modified:
  ossp/trunk/PKGBUILD
  ossp/trunk/osspd.rc.d

------------+
 PKGBUILD   |    7 +++----
 osspd.rc.d |   11 ++---------
 2 files changed, 5 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-28 17:14:48 UTC (rev 125740)
+++ PKGBUILD	2011-05-29 02:05:47 UTC (rev 125741)
@@ -16,6 +16,9 @@
 backup=(etc/conf.d/osspd)
 source=("http://downloads.sourceforge.net/project/osspd/${pkgname}-${pkgver}.tar.gz"
         osspd.rc.d osspd.conf.d)
+md5sums=('ee2d8c894de2fa4eb3291804fbc7df45'
+         '0c02208ce1dfe74b6e9840f3600678cc'
+         '5a5a3db1bb3c98d48d4794613cf12ef0')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -37,7 +40,3 @@
   install -D -m755 "$srcdir/osspd.rc.d" "$pkgdir/etc/rc.d/osspd"
   install -D -m644 "$srcdir/osspd.conf.d" "$pkgdir/etc/conf.d/osspd"
 }
-
-md5sums=('ee2d8c894de2fa4eb3291804fbc7df45'
-         '69b745e0c499cd50019266a99082ce8b'
-         '5a5a3db1bb3c98d48d4794613cf12ef0')

Modified: osspd.rc.d
===================================================================
--- osspd.rc.d	2011-05-28 17:14:48 UTC (rev 125740)
+++ osspd.rc.d	2011-05-29 02:05:47 UTC (rev 125741)
@@ -14,20 +14,13 @@
   fi
 fi
 
-preclaim_oss=/sys/module/soundcore/parameters/preclaim_oss
-
 PID=`pidof -o %PPID /usr/sbin/osspd`
 case "$1" in
   start)
     stat_busy "Starting OSS userspace bridge"
     if [ -z "$PID" ]; then 
-      if [[ -r $preclaim_oss && "$(cat $preclaim_oss)" -eq 1 ]]; then
-        echo "Must boot with soundcore.preclaim_oss=0"
-        stat_die
-      fi
-      modprobe cuse &>/dev/null
-      modprobe -r snd-pcm-oss snd-mixer-oss &>/dev/null
-      sleep 0.1
+      /sbin/modprobe cuse &>/dev/null
+      /sbin/udevadm settle --quiet
       /usr/sbin/osspd --dsp-slave="$DSP_SLAVE"
     fi
     if [ -n "$PID" -o $? -gt 0 ]; then