View | Details | Raw Unified
Collapse All | Expand All

(-) slmodem.orig (-11 / +11 lines)
 Lines 33-59    Link Here  
	if [ "$?" -gt 0 ]
	if [ "$?" -gt 0 ]
	then
	then
		eerror "Missing ${MODULE}. Please set up /etc/conf.d/slmodem"
		eerror "Missing ${MODULE}. Please set up /etc/conf.d/slmodem"
		eend 1;
 
		return 1;
 
    	fi
    	fi

        
	#sleep as per http://bugs.gentoo.org/show_bug.cgi?id=47947#c59
	#sleep as per http://bugs.gentoo.org/show_bug.cgi?id=47947#c59

        
	ebegin "Waiting for ${MODULE} modem driver initialisation"
	ebegin "Waiting for ${MODULE} modem driver initialisation"

        
	local COUNT=0
	local COUNT=0

            

              
	echo -e "${NORMAL}   "

              
	# 52 in the line below is number of characters in ebegin statement + 7

            

            

              
	echo -ne "${NORMAL}"

              
	if [ "$RC_NOCOLOR" != "yes"]; then echo -ne "\e[A\e[52G"; fi

            

        
	while [ ! -c ${MDEV} -a ${COUNT} -lt 5 ];
	while [ ! -c ${MDEV} -a ${COUNT} -lt 5 ];

        
	do
	do

        
		sleep 0.5
		sleep 0.5

            

              
		echo -ne "."

              
		echo -n "."

            

        
		COUNT=`expr ${COUNT} + 1`
		COUNT=`expr ${COUNT} + 1`

        
   	done
   	done

        
    
    

            

              
	echo -ne "\n"

              
	if [ "$RC_NOCOLOR" != "yes" ]; then echo; fi

            

        
    
    

        
	if [ ! -c ${MDEV} ];
	if [ ! -c ${MDEV} ];

        
	then
	then

        
		eerror "Module - ${MODULE} failed to initialise device ${MDEV}"
		eerror "Module - ${MODULE} failed to initialise device ${MDEV}"

            

              
		eend 1

              
		return 1

            

        
	else
	else

        
		eend 0 
		eend 0 

        
	fi
	fi

  

    

    

       Lines 92-107
       
    
  Link Here 
    

  

        
	if [ ! "${MODULE}" == "alsa" ];
	if [ ! "${MODULE}" == "alsa" ];

        
	then
	then

        
		ebegin "Waiting for ${MODULE} modem driver unload"
		ebegin "Waiting for ${MODULE} modem driver unload"

            

              
		echo -e "${NORMAL}   "

              
		# 44 is number of characters in ebegin statement + 7

            

            

              
		echo -ne "${NORMAL}"

              
		if [ "$RC_NOCOLOR" != "yes"]; then echo -ne "\e[A\e[44G"; fi

            

        
		for ((a=0,result=1; result==1 && a <= 5 ; a++))
		for ((a=0,result=1; result==1 && a <= 5 ; a++))

        
		do
		do

        
			sleep 0.25
			sleep 0.25

            

              
			echo -ne "."

              
			echo -n "."

            

        
			modprobe -r slamr 2> /dev/null && result=0
			modprobe -r slamr 2> /dev/null && result=0

        
		done
		done

            

              
		echo -ne "\n"

              
		if [ "$RC_NOCOLOR" != "yes" ]; then echo; fi

            

            

              
		eend ${result}

              

            

        
	fi
	fi

        
	unlink ${LN_DEV} 2> /dev/null
	unlink ${LN_DEV} 2> /dev/null

            

              
              
	eend ${result}

            

        
}
}