# HG changeset patch
# User Dominique Corbex <domcox@users.sourceforge.net>
# Date 1245225935 -7200
# Node ID 778f75d8af146a25311bfa5f3ff4fc7f16e2193d
# Parent  e5ab27ad8b9e89eff9bed70f19c872887a42791d
get-softmodem-driver: bug fixes

diff -r e5ab27ad8b9e -r 778f75d8af14 get-softmodem-driver/receipt
--- a/get-softmodem-driver/receipt	Wed Jun 17 09:49:44 2009 +0200
+++ b/get-softmodem-driver/receipt	Wed Jun 17 10:05:35 2009 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="get-softmodem-driver"
-VERSION="0.8"
+VERSION="0.9"
 CATEGORY="non-free"
 SHORT_DESC="Get misc softmodem drivers."
 MAINTAINER="domcox@slitaz.org"
@@ -17,8 +17,8 @@
 		ln -s $PACKAGE $fs/usr/bin/get-$i-driver
 	done
 	mkdir -p $fs/usr/share/softmodem
-	cp stuff/*diff $fs/usr/share/softmodem
-	cp stuff/*receipt $fs/usr/share/softmodem
-	cp stuff/*init $fs/usr/share/softmodem
-	cp stuff/zone.tab $fs/usr/share/softmodem
+	cp -a stuff/*diff $fs/usr/share/softmodem
+	cp -a stuff/*receipt $fs/usr/share/softmodem
+	cp -a stuff/*init $fs/usr/share/softmodem
+	cp -a stuff/zone.tab $fs/usr/share/softmodem
 }
diff -r e5ab27ad8b9e -r 778f75d8af14 get-softmodem-driver/stuff/martian.init
--- a/get-softmodem-driver/stuff/martian.init	Wed Jun 17 09:49:44 2009 +0200
+++ b/get-softmodem-driver/stuff/martian.init	Wed Jun 17 10:05:35 2009 +0200
@@ -8,7 +8,7 @@
 . /etc/init.d/rc.functions
 . /etc/daemons.conf
 
-NAME=Martian modem
+NAME="Martian modem"
 DESC="Agere Systems PCI Modem deamon"
 DAEMON=/usr/sbin/martian_modem
 OPTIONS="--daemon $MARTIAN_OPTIONS /dev/ttySM0"
@@ -27,9 +27,8 @@
       exit 1
     fi
     echo -n "Starting $DESC: $NAME... "
-    $DAEMON $OPTIONS
+    $DAEMON $OPTIONS &&  echo `/bin/pidof $DAEMON` > $PIDFILE
     status
-	echo `/sbin/pidof $DAEMON` > $PIDFILE
     ;;
   stop)
     if [ ! -f $PIDFILE ] ; then
@@ -48,9 +47,8 @@
     echo -n "Restarting $DESC: $NAME... "
     kill `cat $PIDFILE`
     sleep 2
-    $DAEMON $OPTIONS
+    $DAEMON $OPTIONS &&  echo `/bin/pidof $DAEMON` > $PIDFILE
     status
-	echo `/sbin/pidof $DAEMON` > $PIDFILE
     ;;
   *)
     echo ""
diff -r e5ab27ad8b9e -r 778f75d8af14 get-softmodem-driver/stuff/slmodem.init
--- a/get-softmodem-driver/stuff/slmodem.init	Wed Jun 17 09:49:44 2009 +0200
+++ b/get-softmodem-driver/stuff/slmodem.init	Wed Jun 17 10:05:35 2009 +0200
@@ -8,17 +8,11 @@
 . /etc/init.d/rc.functions
 . /etc/daemons.conf
 
-NAME=Smartlink modem
+NAME="Smartlink modem"
 DESC="Smart Link Modem deamon"
 DAEMON=/usr/sbin/slmodemd
 OPTIONS=$SLMODEM_OPTIONS
 PIDFILE=/var/run/slmodemd.pid
-MODULE="slamr"
-
-if [ `/sbin/lsmod | grep -c ${MODULE}` -lt "1" ]; then
-	echo "kernel module is not loaded!"
-	exit 1
-fi
 
 case "$1" in
   start)
@@ -27,9 +21,8 @@
       exit 1
     fi
     echo -n "Starting $DESC: $NAME... "
-    $DAEMON $OPTIONS
+    $DAEMON $OPTIONS &&  echo `/bin/pidof $DAEMON` > $PIDFILE
     status
-	echo `/sbin/pidof $DAEMON` > $PIDFILE
     ;;
   stop)
     if [ ! -f $PIDFILE ] ; then
@@ -48,9 +41,8 @@
     echo -n "Restarting $DESC: $NAME... "
     kill `cat $PIDFILE`
     sleep 2
-    $DAEMON $OPTIONS
+    $DAEMON $OPTIONS &&  echo `/bin/pidof $DAEMON` > $PIDFILE
     status
-	echo `/sbin/pidof $DAEMON` > $PIDFILE
     ;;
   *)
     echo ""