wok-4.x rev 3479
get-softmodem-driver: bug fixes
author | Dominique Corbex <domcox@users.sourceforge.net> |
---|---|
date | Wed Jun 17 10:05:35 2009 +0200 (2009-06-17) |
parents | e5ab27ad8b9e |
children | 07049ed346d9 |
files | get-softmodem-driver/receipt get-softmodem-driver/stuff/martian.init get-softmodem-driver/stuff/slmodem.init |
line diff
1.1 --- a/get-softmodem-driver/receipt Wed Jun 17 09:49:44 2009 +0200 1.2 +++ b/get-softmodem-driver/receipt Wed Jun 17 10:05:35 2009 +0200 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="get-softmodem-driver" 1.7 -VERSION="0.8" 1.8 +VERSION="0.9" 1.9 CATEGORY="non-free" 1.10 SHORT_DESC="Get misc softmodem drivers." 1.11 MAINTAINER="domcox@slitaz.org" 1.12 @@ -17,8 +17,8 @@ 1.13 ln -s $PACKAGE $fs/usr/bin/get-$i-driver 1.14 done 1.15 mkdir -p $fs/usr/share/softmodem 1.16 - cp stuff/*diff $fs/usr/share/softmodem 1.17 - cp stuff/*receipt $fs/usr/share/softmodem 1.18 - cp stuff/*init $fs/usr/share/softmodem 1.19 - cp stuff/zone.tab $fs/usr/share/softmodem 1.20 + cp -a stuff/*diff $fs/usr/share/softmodem 1.21 + cp -a stuff/*receipt $fs/usr/share/softmodem 1.22 + cp -a stuff/*init $fs/usr/share/softmodem 1.23 + cp -a stuff/zone.tab $fs/usr/share/softmodem 1.24 }
2.1 --- a/get-softmodem-driver/stuff/martian.init Wed Jun 17 09:49:44 2009 +0200 2.2 +++ b/get-softmodem-driver/stuff/martian.init Wed Jun 17 10:05:35 2009 +0200 2.3 @@ -8,7 +8,7 @@ 2.4 . /etc/init.d/rc.functions 2.5 . /etc/daemons.conf 2.6 2.7 -NAME=Martian modem 2.8 +NAME="Martian modem" 2.9 DESC="Agere Systems PCI Modem deamon" 2.10 DAEMON=/usr/sbin/martian_modem 2.11 OPTIONS="--daemon $MARTIAN_OPTIONS /dev/ttySM0" 2.12 @@ -27,9 +27,8 @@ 2.13 exit 1 2.14 fi 2.15 echo -n "Starting $DESC: $NAME... " 2.16 - $DAEMON $OPTIONS 2.17 + $DAEMON $OPTIONS && echo `/bin/pidof $DAEMON` > $PIDFILE 2.18 status 2.19 - echo `/sbin/pidof $DAEMON` > $PIDFILE 2.20 ;; 2.21 stop) 2.22 if [ ! -f $PIDFILE ] ; then 2.23 @@ -48,9 +47,8 @@ 2.24 echo -n "Restarting $DESC: $NAME... " 2.25 kill `cat $PIDFILE` 2.26 sleep 2 2.27 - $DAEMON $OPTIONS 2.28 + $DAEMON $OPTIONS && echo `/bin/pidof $DAEMON` > $PIDFILE 2.29 status 2.30 - echo `/sbin/pidof $DAEMON` > $PIDFILE 2.31 ;; 2.32 *) 2.33 echo ""
3.1 --- a/get-softmodem-driver/stuff/slmodem.init Wed Jun 17 09:49:44 2009 +0200 3.2 +++ b/get-softmodem-driver/stuff/slmodem.init Wed Jun 17 10:05:35 2009 +0200 3.3 @@ -8,17 +8,11 @@ 3.4 . /etc/init.d/rc.functions 3.5 . /etc/daemons.conf 3.6 3.7 -NAME=Smartlink modem 3.8 +NAME="Smartlink modem" 3.9 DESC="Smart Link Modem deamon" 3.10 DAEMON=/usr/sbin/slmodemd 3.11 OPTIONS=$SLMODEM_OPTIONS 3.12 PIDFILE=/var/run/slmodemd.pid 3.13 -MODULE="slamr" 3.14 - 3.15 -if [ `/sbin/lsmod | grep -c ${MODULE}` -lt "1" ]; then 3.16 - echo "kernel module is not loaded!" 3.17 - exit 1 3.18 -fi 3.19 3.20 case "$1" in 3.21 start) 3.22 @@ -27,9 +21,8 @@ 3.23 exit 1 3.24 fi 3.25 echo -n "Starting $DESC: $NAME... " 3.26 - $DAEMON $OPTIONS 3.27 + $DAEMON $OPTIONS && echo `/bin/pidof $DAEMON` > $PIDFILE 3.28 status 3.29 - echo `/sbin/pidof $DAEMON` > $PIDFILE 3.30 ;; 3.31 stop) 3.32 if [ ! -f $PIDFILE ] ; then 3.33 @@ -48,9 +41,8 @@ 3.34 echo -n "Restarting $DESC: $NAME... " 3.35 kill `cat $PIDFILE` 3.36 sleep 2 3.37 - $DAEMON $OPTIONS 3.38 + $DAEMON $OPTIONS && echo `/bin/pidof $DAEMON` > $PIDFILE 3.39 status 3.40 - echo `/sbin/pidof $DAEMON` > $PIDFILE 3.41 ;; 3.42 *) 3.43 echo ""