diff options
| author |   Alin Năstac <mrness@gentoo.org> | 2007-03-10 15:03:31 +0000 |
|---|---|---|
| committer | Alin Năstac <mrness@gentoo.org> | 2007-03-10 15:03:31 +0000 |
| commit | d3cfb917aabc0062b37577f61e291e3d71bbc01d (patch) | |
| tree | a82ff018cfc005aeee7fb01e79fd2fe9a72d95c4 /net-dialup | |
| parent | stop using $IMAGE (diff) | |
| download | gentoo-2-d3cfb917aabc0062b37577f61e291e3d71bbc01d.tar.gz gentoo-2-d3cfb917aabc0062b37577f61e291e3d71bbc01d.tar.bz2 gentoo-2-d3cfb917aabc0062b37577f61e291e3d71bbc01d.zip | |
Replace bash-specific code from init script, thanks to Natanael Copa <natanael.copa@gmail.com> (#170092).
(Portage version: 2.1.2.2)
Diffstat (limited to 'net-dialup')
| -rw-r--r-- | net-dialup/slmodem/ChangeLog | 6 | ||||
| -rw-r--r-- | net-dialup/slmodem/files/slmodem-initd | 19 |
2 files changed, 11 insertions, 14 deletions
diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog index 0041436cd5ef..5f347e5e0d93 100644 --- a/net-dialup/slmodem/ChangeLog +++ b/net-dialup/slmodem/ChangeLog @@ -1,12 +1,14 @@ # ChangeLog for net-dialup/slmodem # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.79 2007/03/10 14:29:31 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.80 2007/03/10 15:03:31 mrness Exp $ 10 Mar 2007; Alin Năstac <mrness@gentoo.org> - -files/slmodem-2.9.11-kernel-2.6.18.patch, + -files/slmodem-2.9.11-kernel-2.6.18.patch, files/slmodem-initd, -slmodem-2.9.11_pre20051101-r3.ebuild, slmodem-2.9.11_pre20061021-r1.ebuild: Remove obsolete version. Remove references to $ROOT from src_install (#168039). + Replace bash-specific code from init script, thanks to Natanael Copa + <natanael.copa@gmail.com> (#170092). 20 Dec 2006; Alin Năstac <mrness@gentoo.org> files/slmodem-2.9.11-kernel-2.6.19.patch: diff --git a/net-dialup/slmodem/files/slmodem-initd b/net-dialup/slmodem/files/slmodem-initd index 81c6eb7993a0..da472cdddf75 100644 --- a/net-dialup/slmodem/files/slmodem-initd +++ b/net-dialup/slmodem/files/slmodem-initd @@ -17,7 +17,7 @@ checkconfig() { fi } -function loadsalsa { +loadsalsa { ebegin "Starting slmodemd for ${DEV}" start-stop-daemon --start --background --nicelevel=${NICE} --make-pidfile \ --pidfile /var/run/slmodemd.pid --startas /usr/sbin/slmodemd \ @@ -25,7 +25,7 @@ function loadsalsa { return ${?} } -function loadsmodule { +loadsmodule { modprobe ${MODULE} if [ "$?" -gt 0 ]; then @@ -60,7 +60,7 @@ start() { # either if we use alsa or not, the only thing we need is # ttySL0, which is created by slmodemd when started (points to a pts) - if [ "${MODULE}" == "alsa" ]; then + if [ "${MODULE}" = "alsa" ]; then loadsalsa else loadsmodule @@ -80,15 +80,10 @@ stop() { [ -e /var/run/slmodemd.pid ] && rm /var/run/slmodemd.pid unlink ${LN_DEV} 2> /dev/null eend ${result} - if [ ! "${MODULE}" == "alsa" ]; then - ebegin "Waiting for ${MODULE} modem driver unload" - if [ "$RC_NOCOLOR" != "yes" ]; then - echo -e "\e[A\e[44G " - echo -ne "\e[A\e[44G" - fi - for ((a=0,result=1; result==1 && a <= 5 ; a++)) - do - sleep 0.25 + if [ ! "${MODULE}" = "alsa" ]; then + ebegin "Waiting for ${MODULE} modem driver unload..." + for a in $(seq 0 2); do + sleep 1 echo -n "." modprobe -r slamr 2> /dev/null && result=0 done |