From cd5b0d5816bc24f535153b0991364827dbf07d32 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alin=20N=C4=83stac?= Date: Sat, 10 Mar 2007 15:03:31 +0000 Subject: [PATCH] Replace bash-specific code from init script, thanks to Natanael Copa (#170092). Package-Manager: portage-2.1.2.2 --- net-dialup/slmodem/ChangeLog | 6 ++++-- net-dialup/slmodem/Manifest | 22 +++++++++++----------- net-dialup/slmodem/files/slmodem-initd | 19 +++++++------------ 3 files changed, 22 insertions(+), 25 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 - -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 + (#170092). 20 Dec 2006; Alin Năstac files/slmodem-2.9.11-kernel-2.6.19.patch: diff --git a/net-dialup/slmodem/Manifest b/net-dialup/slmodem/Manifest index ca3133871d0d..afe1eab5e764 100644 --- a/net-dialup/slmodem/Manifest +++ b/net-dialup/slmodem/Manifest @@ -13,10 +13,10 @@ AUX slmodem-confd 800 RMD160 7c5460263589cb8b384353484d08b100bdc5b8d2 SHA1 5a734 MD5 e5bd1ccfecc078dc1797bd16991f36ba files/slmodem-confd 800 RMD160 7c5460263589cb8b384353484d08b100bdc5b8d2 files/slmodem-confd 800 SHA256 f430a8bb00aa4ee3cda98ad9fee99125e16727064d0568709740b710ed3525c8 files/slmodem-confd 800 -AUX slmodem-initd 2290 RMD160 685d838f6bfb9a1a58333823bd26c9449f9b35d8 SHA1 1f7d449f7aa9cf16d501c310da93d1009bfe58db SHA256 fb87fca93588201a2659293dfa3df005f32e8d13b7cd7158fb7a69262306810f -MD5 7d6ed4099ad33788dbac6a8a23f4f143 files/slmodem-initd 2290 -RMD160 685d838f6bfb9a1a58333823bd26c9449f9b35d8 files/slmodem-initd 2290 -SHA256 fb87fca93588201a2659293dfa3df005f32e8d13b7cd7158fb7a69262306810f files/slmodem-initd 2290 +AUX slmodem-initd 2146 RMD160 62dbd254e1b9b134dda8a7b99bb9a18fd6a35063 SHA1 4c5e7b673e87515c497506e70476b02703c7b559 SHA256 e5d0506149fe27411100c6293eda9489a4d1a29502976c9603cfda06a995e73c +MD5 09aef16c556b8cde9f3c661c700fe018 files/slmodem-initd 2146 +RMD160 62dbd254e1b9b134dda8a7b99bb9a18fd6a35063 files/slmodem-initd 2146 +SHA256 e5d0506149fe27411100c6293eda9489a4d1a29502976c9603cfda06a995e73c files/slmodem-initd 2146 AUX slmodem-modules 106 RMD160 41b949de0d6a2c47d0227c97b065336cc54ed50e SHA1 933fbb37e99e26b838d508c177cf69097903c36b SHA256 0ae1432fbae6e517190a841a6ae09806f24c16614e845d2e814a568285d96a7f MD5 e91d1df68be76c531a8514dba77c1886 files/slmodem-modules 106 RMD160 41b949de0d6a2c47d0227c97b065336cc54ed50e files/slmodem-modules 106 @@ -31,10 +31,10 @@ EBUILD slmodem-2.9.11_pre20061021-r1.ebuild 4732 RMD160 324f69a92f4295b0ddbc8776 MD5 b163a527b9be6eca830722a33a321702 slmodem-2.9.11_pre20061021-r1.ebuild 4732 RMD160 324f69a92f4295b0ddbc87769ad4c29900bcc022 slmodem-2.9.11_pre20061021-r1.ebuild 4732 SHA256 187bdc389b7f1a2a6ee5e7bc58281b3aab6f22d3c8c7773f39bb8b569c1f13f2 slmodem-2.9.11_pre20061021-r1.ebuild 4732 -MISC ChangeLog 17384 RMD160 d041df0a20a84cefcb8482bfa4137786b14918c6 SHA1 87eae4ce911a52efe84170437348be52fd373f46 SHA256 40fc953505325d1e222408f3f175e92598899c810fc0e3528b1883a1ac5cf7d9 -MD5 683f6827ff136e7b85c7735a5e3becda ChangeLog 17384 -RMD160 d041df0a20a84cefcb8482bfa4137786b14918c6 ChangeLog 17384 -SHA256 40fc953505325d1e222408f3f175e92598899c810fc0e3528b1883a1ac5cf7d9 ChangeLog 17384 +MISC ChangeLog 17515 RMD160 23bcc86c66f0d4e4621f18d3f5fb01bd29970400 SHA1 291d5ac978ccc8cd29c0585e53bbaef3be00db03 SHA256 38f86c81ed33ada2e9c2fc257a19d801b86910de91f9a24363f8acc4cf7fdebe +MD5 6b526766983af7c5f207eb4a72203e71 ChangeLog 17515 +RMD160 23bcc86c66f0d4e4621f18d3f5fb01bd29970400 ChangeLog 17515 +SHA256 38f86c81ed33ada2e9c2fc257a19d801b86910de91f9a24363f8acc4cf7fdebe ChangeLog 17515 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e metadata.xml 163 @@ -45,7 +45,7 @@ SHA256 55e9c497a14ce5058ab1b24c2540bded458b7bcb88bece092aebc0d6f1a301f3 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFF8sDRJnxX6mF440QRAvE3AJwPRbspE1eHWnqEyfRrZuUBIZG3ewCgz5BV -6ypwY/qcTC4eXtKdyMEkVfs= -=Vu2N +iD8DBQFF8sjOJnxX6mF440QRAnXqAKDqglZFJrDnzPZH/j9r2zM/aAWdsQCgsahc +dv8zBO1aZZ0sY6l5htMBZf8= +=B552 -----END PGP SIGNATURE----- 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 -- 2.26.2