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

Collapse All | Expand All

(-)orig.lm_sensors-3-init.d (-30 / +60 lines)
Lines 10-17 Link Here
10
	fi
10
	fi
11
11
12
	if [ "${LOADMODULES}" = "yes" -a -f /proc/modules ]; then
12
	if [ "${LOADMODULES}" = "yes" -a -f /proc/modules ]; then
13
		if [ -z "${MODULE_0}" ]; then
13
		if [ -z "${MODULE_0}" ] && [ -z "${HWMON_MODULES}" ]; then
14
			eerror "MODULE_0 is not set in /etc/conf.d/lm_sensors, try running sensors-detect"
14
			eerror "HWMON_MODULES or MODULE_0 is not set in /etc/conf.d/lm_sensors, try running sensors-detect"
15
			return 1
16
		fi
17
		if ! [ -z "${MODULE_0}" ] && ! [ -z "${HWMON_MODULES}" ]; then
18
			eerror "HWMON_MODULES or MODULE_0 can't be both set in /etc/conf.d/lm_sensors, try running sensors-detect"
15
			return 1
19
			return 1
16
		fi
20
		fi
17
	fi
21
	fi
Lines 46-63 Link Here
46
			eend 0
50
			eend 0
47
		fi
51
		fi
48
52
49
		i=0
53
		if ! [ -z "${MODULE_0}" ]; then
50
		while true; do
54
			i=0
51
			module=`eval echo '$'MODULE_${i}`
55
			while true; do
52
			module_args=`eval echo '$'MODULE_${i}_ARGS`
56
				module=`eval echo '$'MODULE_${i}`
53
			if [ -z "${module}" ]; then
57
				module_args=`eval echo '$'MODULE_${i}_ARGS`
54
				break
58
				if [ -z "${module}" ]; then
55
			fi
59
					break
56
			ebegin "  Loading ${module}"
60
				fi
57
			modprobe ${module} ${module_args} >/dev/null 2>&1
61
				ebegin "  Loading ${module}"
58
			eend $?
62
				modprobe ${module} ${module_args} >/dev/null 2>&1
59
			i=$(($i+1))
63
				eend $?
60
		done
64
				i=$(($i+1))
65
			done
66
		fi
67
68
		if ! [ -z "${HWMON_MODULES}" ]; then
69
			for module in ${HWMON_MODULES}; do
70
				ebegin "  Loading ${module}"
71
				modprobe ${module} >/dev/null 2>&1
72
				eend $?
73
			done
74
		fi
61
	fi
75
	fi
62
76
63
	if [ "${INITSENSORS}" = "yes" ]; then
77
	if [ "${INITSENSORS}" = "yes" ]; then
Lines 78-100 Link Here
78
	if [ "${LOADMODULES}" = "yes" -a -f /proc/modules ]; then
92
	if [ "${LOADMODULES}" = "yes" -a -f /proc/modules ]; then
79
		einfo "Unloading lm_sensors modules..."
93
		einfo "Unloading lm_sensors modules..."
80
94
81
		# find the highest possible MODULE_ number
95
		if ! [ -z "${MODULE_0}" ]; then
82
		i=0
96
			# find the highest possible MODULE_ number
83
		while true; do
97
			i=0
84
			module=`eval echo '$'MODULE_${i}`
98
			while true; do
85
			if [ -z "${module}" ] ; then
99
				module=`eval echo '$'MODULE_${i}`
86
				break
100
				if [ -z "${module}" ] ; then
87
			fi
101
					break
88
			i=$(($i+1))
102
				fi
89
		done
103
				i=$(($i+1))
104
			done
90
105
91
		while [ ${i} -gt 0 ]; do
106
			while [ ${i} -gt 0 ]; do
92
			i=$(($i-1))
107
				i=$(($i-1))
93
			module=`eval echo '$'MODULE_${i}`
108
				module=`eval echo '$'MODULE_${i}`
94
			ebegin "  Unloading ${module}"
109
				ebegin "  Unloading ${module}"
95
			rmmod ${module} >/dev/null 2>&1
110
				rmmod ${module} >/dev/null 2>&1
96
			eend $?
111
				eend $?
97
		done
112
			done
113
		fi
114
115
		if ! [ -z "${HWMON_MODULES}" ]; then
116
			# unload modules in reverse order
117
			REV_HW_MODULES=""
118
			for module in ${HWMON_MODULES}; do
119
				REV_HWMON_MODULES=${module}" "${REV_HWMON_MODULES}
120
			done
121
122
			for module in ${REV_HWMON_MODULES}; do
123
				ebegin "  Unloading ${module}"
124
				rmmod ${module} >/dev/null 2>&1
125
				eend $?
126
			done
127
		fi
98
128
99
		if [ -e /proc/sys/dev/sensors ] ; then
129
		if [ -e /proc/sys/dev/sensors ] ; then
100
			ebegin "  Unloading i2c-proc"
130
			ebegin "  Unloading i2c-proc"

Return to bug 480018