Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 58222 | Differences between
and this patch

Collapse All | Expand All

(-)slmodem.orig (-11 / +11 lines)
Lines 33-59 Link Here
33
	if [ "$?" -gt 0 ]
33
	if [ "$?" -gt 0 ]
34
	then
34
	then
35
		eerror "Missing ${MODULE}. Please set up /etc/conf.d/slmodem"
35
		eerror "Missing ${MODULE}. Please set up /etc/conf.d/slmodem"
36
		eend 1;
36
		return 1;
37
    	fi
37
    	fi
38
38
39
	#sleep as per http://bugs.gentoo.org/show_bug.cgi?id=47947#c59
39
	#sleep as per http://bugs.gentoo.org/show_bug.cgi?id=47947#c59
40
	ebegin "Waiting for ${MODULE} modem driver initialisation"
40
	ebegin "Waiting for ${MODULE} modem driver initialisation"
41
	local COUNT=0
41
	local COUNT=0
42
	echo -e "${NORMAL}   "
42
	# 52 in the line below is number of characters in ebegin statement + 7
43
	echo -ne "${NORMAL}"
43
	if [ "$RC_NOCOLOR" != "yes"]; then echo -ne "\e[A\e[52G"; fi
44
	while [ ! -c ${MDEV} -a ${COUNT} -lt 5 ];
44
	while [ ! -c ${MDEV} -a ${COUNT} -lt 5 ];
45
	do
45
	do
46
		sleep 0.5
46
		sleep 0.5
47
		echo -ne "."
47
		echo -n "."
48
		COUNT=`expr ${COUNT} + 1`
48
		COUNT=`expr ${COUNT} + 1`
49
   	done
49
   	done
50
    
50
    
51
	echo -ne "\n"
51
	if [ "$RC_NOCOLOR" != "yes" ]; then echo; fi
52
    
52
    
53
	if [ ! -c ${MDEV} ];
53
	if [ ! -c ${MDEV} ];
54
	then
54
	then
55
		eerror "Module - ${MODULE} failed to initialise device ${MDEV}"
55
		eerror "Module - ${MODULE} failed to initialise device ${MDEV}"
56
		eend 1
56
		return 1
57
	else
57
	else
58
		eend 0 
58
		eend 0 
59
	fi
59
	fi
Lines 92-107 Link Here
92
	if [ ! "${MODULE}" == "alsa" ];
92
	if [ ! "${MODULE}" == "alsa" ];
93
	then
93
	then
94
		ebegin "Waiting for ${MODULE} modem driver unload"
94
		ebegin "Waiting for ${MODULE} modem driver unload"
95
		echo -e "${NORMAL}   "
95
		# 44 is number of characters in ebegin statement + 7
96
		echo -ne "${NORMAL}"
96
		if [ "$RC_NOCOLOR" != "yes"]; then echo -ne "\e[A\e[44G"; fi
97
		for ((a=0,result=1; result==1 && a <= 5 ; a++))
97
		for ((a=0,result=1; result==1 && a <= 5 ; a++))
98
		do
98
		do
99
			sleep 0.25
99
			sleep 0.25
100
			echo -ne "."
100
			echo -n "."
101
			modprobe -r slamr 2> /dev/null && result=0
101
			modprobe -r slamr 2> /dev/null && result=0
102
		done
102
		done
103
		echo -ne "\n"
103
		if [ "$RC_NOCOLOR" != "yes" ]; then echo; fi
104
		eend ${result}
105
	fi
104
	fi
106
	unlink ${LN_DEV} 2> /dev/null
105
	unlink ${LN_DEV} 2> /dev/null
106
	eend ${result}
107
}
107
}

Return to bug 58222