Attachment #251773 for bug #342313

Lines 40-50 start_pre() Link Here

(-)a/init.d.misc/openvpn.in (-5 / +3 lines)
40	{	40	{
41	# Linux has good dynamic tun/tap creation	41	# Linux has good dynamic tun/tap creation
42	if [ "$RC_UNAME" = Linux ]; then	42	if [ "$RC_UNAME" = Linux ]; then
43	if [ ! -e /dev/net/tun ]; then	43	if [ ! -e /dev/net/tun ] && ! modprobe tun >/dev/null 2>&1; then
44	if ! modprobe tun; then	44	eerror "TUN/TAP support is not available in this kernel"
45	eerror "TUN/TAP support is not available in this kernel"	45	return 1
46	return 1
47	fi
48	fi	46	fi
49	if [ -h /dev/net/tun -a -c /dev/misc/net/tun ]; then	47	if [ -h /dev/net/tun -a -c /dev/misc/net/tun ]; then
50	ebegin "Detected broken /dev/net/tun symlink, fixing..."	48	ebegin "Detected broken /dev/net/tun symlink, fixing..."

Lines 78-84 start() Link Here

(-)a/init.d/hwclock.in (-1 / +1 lines)
78	for rtc in /dev/rtc /dev/rtc[0-9]*; do	78	for rtc in /dev/rtc /dev/rtc[0-9]*; do
79	[ -e "$rtc" ] && break	79	[ -e "$rtc" ] && break
80	done	80	done
81	if [ ! -e "${rtc}" ]; then	81	if [ ! -e "${rtc}" ] && type modprobe >/dev/null 2>&1; then
82	modprobe -q rtc-cmos \|\| modprobe -q rtc \|\| modprobe -q genrtc	82	modprobe -q rtc-cmos \|\| modprobe -q rtc \|\| modprobe -q genrtc
83	fi	83	fi
84	fi	84	fi

Lines 15-21 start() Link Here

(-)a/init.d/procfs.in (-1 / +1 lines)
15	{	15	{
16	# Make sure we insert usbcore if it's a module	16	# Make sure we insert usbcore if it's a module
17	if [ -f /proc/modules -a ! -d /proc/bus/usb ]; then	17	if [ -f /proc/modules -a ! -d /proc/bus/usb ]; then
18	modprobe -q usbcore	18	modprobe -q usbcore >/dev/null 2>&1
19	fi	19	fi
20		20
21	[ -e /proc/filesystems ] \|\| return 0	21	[ -e /proc/filesystems ] \|\| return 0

Lines 27-37 bonding_pre_start() Link Here

(-)a/net/bonding.sh (-5 / +3 lines)
27	[ -z "${slaves}" ] && return 0	27	[ -z "${slaves}" ] && return 0
28		28
29	# Load the kernel module if required	29	# Load the kernel module if required
30	if [ ! -d /proc/net/bonding ]; then	30	if [ ! -d /proc/net/bonding ] && ! modprobe bonding >/dev/null 2>&1; then
31	if ! modprobe bonding; then	31	eerror "Cannot load the bonding module"
32	eerror "Cannot load the bonding module"	32	return 1
33	return 1
34	fi
35	fi	33	fi
36		34
37	# We can create the interface name we like now, but this	35	# We can create the interface name we like now, but this




	local ccwgroup="$(_get_array "ccwgroup_${IFVAR}")"
	[ -z "${ccwgroup}" ] && return 0

	if [ ! -d /sys/bus/ccwgroup ] && ! modprobe qeth >/dev/null 2>&1; then
		eerror "ccwgroup support missing in kernel"
		return 1
			eerror "ccwgroup support missing in kernel"
			return 1
		fi
	fi

	einfo "Enabling ccwgroup on ${IFACE}"




	eval clip=\$clip_${IFVAR}
	[ -z "${clip}" ] && return 0

	if [ ! -r /proc/net/atm/arp ] && ! modprobe clip >/dev/null 2>&1; then
		modprobe clip && sleep 2
		if [ ! -r /proc/net/atm/arp ]; then
	    	eerror "You need first to enable kernel support for ATM CLIP"
	    	return 1
	fi
    fi
	
    local started_here=
    if ! are_atmclip_svcs_running; then




	#Specialized stuff. Insert here actions particular to connection type (pppoe,pppoa,capi)
	local insert_link_in_opts=1
	if ${haspppoe}; then
		# Load the PPPoE kernel module
		if [ ! -e /proc/net/pppoe ] && ! modprobe pppoe >/dev/null 2>&1; then
			eerror "kernel does not support PPPoE"
			return 1
				return 1
			fi
		fi

		# Ensure that the link exists and is up

	fi

	if ${haspppoa}; then
		# Load the PPPoA kernel module
		if [ ! -d /proc/net/atm ] && ! modprobe pppoatm >/dev/null 2>&1; then
			eerror "kernel does not support PPPoATM"
			return 1
				return 1
			fi
		fi

		if [ "${link}" != "/dev/null" ]; then

Lines 21-27 tuntap_pre_start() Link Here

(-)a/net/tuntap.sh (-1 / +1 lines)
21	[ -z "${tuntap}" ] && return 0	21	[ -z "${tuntap}" ] && return 0
22		22
23	if [ ! -e /dev/net/tun ]; then	23	if [ ! -e /dev/net/tun ]; then
24	if ! modprobe tun; then	24	if ! modprobe tun >/dev/null 2>&1; then
25	eerror "TUN/TAP support is not present in this kernel"	25	eerror "TUN/TAP support is not present in this kernel"
26	return 1	26	return 1
27	fi	27	fi





_check_vlan()
{
	if [ ! -d /proc/net/vlan ] && ! modprobe 8021q >/dev/null 2>&1; then
		eerror "VLAN (802.1q) support is not present in this kernel"
		return 1
			eerror "VLAN (802.1q) support is not present in this kernel"
			return 1
		fi
	fi
}

- 

Return to bug 342313

Lines 90-102 clip_pre_start() Link Here

(-)a/net/clip.sh (-5 / +2 lines)
90	eval clip=\$clip_${IFVAR}	90	eval clip=\$clip_${IFVAR}
91	[ -z "${clip}" ] && return 0	91	[ -z "${clip}" ] && return 0
92		92
93	if [ ! -r /proc/net/atm/arp ]; then	93	if [ ! -r /proc/net/atm/arp ] && ! modprobe clip >/dev/null 2>&1; then
94	modprobe clip && sleep 2
95	if [ ! -r /proc/net/atm/arp ]; then
96	eerror "You need first to enable kernel support for ATM CLIP"	94	eerror "You need first to enable kernel support for ATM CLIP"
97	return 1	95	return 1
98	fi	96	fi
99	fi
100		97
101	local started_here=	98	local started_here=
102	if ! are_atmclip_svcs_running; then	99	if ! are_atmclip_svcs_running; then

Lines 164-175 pppd_pre_start() Link Here

(-)a/net/pppd.sh (-12 / +8 lines)
164	#Specialized stuff. Insert here actions particular to connection type (pppoe,pppoa,capi)	164	#Specialized stuff. Insert here actions particular to connection type (pppoe,pppoa,capi)
165	local insert_link_in_opts=1	165	local insert_link_in_opts=1
166	if ${haspppoe}; then	166	if ${haspppoe}; then
167	if [ ! -e /proc/net/pppoe ]; then	167	# Load the PPPoE kernel module
168	# Load the PPPoE kernel module	168	if [ ! -e /proc/net/pppoe ] && ! modprobe pppoe >/dev/null 2>&1; then
169	if ! modprobe pppoe; then	169	eerror "kernel does not support PPPoE"
170	eerror "kernel does not support PPPoE"	170	return 1
171	return 1
172	fi
173	fi	171	fi
174		172
175	# Ensure that the link exists and is up	173	# Ensure that the link exists and is up
Lines 178-189 pppd_pre_start() Link Here
178	fi	176	fi
179		177
180	if ${haspppoa}; then	178	if ${haspppoa}; then
181	if [ ! -d /proc/net/atm ]; then	179	# Load the PPPoA kernel module
182	# Load the PPPoA kernel module	180	if [ ! -d /proc/net/atm ] && ! modprobe pppoatm >/dev/null 2>&1; then
183	if ! modprobe pppoatm; then	181	eerror "kernel does not support PPPoATM"
184	eerror "kernel does not support PPPoATM"	182	return 1
185	return 1
186	fi
187	fi	183	fi
188		184
189	if [ "${link}" != "/dev/null" ]; then	185	if [ "${link}" != "/dev/null" ]; then

Lines 13-24 ccwgroup_pre_start() Link Here

(-)a/net/ccwgroup.sh (-6 / +3 lines)
13	local ccwgroup="$(_get_array "ccwgroup_${IFVAR}")"	13	local ccwgroup="$(_get_array "ccwgroup_${IFVAR}")"
14	[ -z "${ccwgroup}" ] && return 0	14	[ -z "${ccwgroup}" ] && return 0
15		15
16	if [ ! -d /sys/bus/ccwgroup ]; then	16	if [ ! -d /sys/bus/ccwgroup ] && ! modprobe qeth >/dev/null 2>&1; then
17	modprobe qeth	17	eerror "ccwgroup support missing in kernel"
18	if [ ! -d /sys/bus/ccwgroup ]; then	18	return 1
19	eerror "ccwgroup support missing in kernel"
20	return 1
21	fi
22	fi	19	fi
23		20
24	einfo "Enabling ccwgroup on ${IFACE}"	21	einfo "Enabling ccwgroup on ${IFACE}"

Lines 25-36 _get_vlans() Link Here

(-)a/net/vlan.sh (-7 / +3 lines)
25		25
26	_check_vlan()	26	_check_vlan()
27	{	27	{
28	if [ ! -d /proc/net/vlan ]; then	28	if [ ! -d /proc/net/vlan ] && ! modprobe 8021q >/dev/null 2>&1; then
29	modprobe 8021q	29	eerror "VLAN (802.1q) support is not present in this kernel"
30	if [ ! -d /proc/net/vlan ]; then	30	return 1
31	eerror "VLAN (802.1q) support is not present in this kernel"
32	return 1
33	fi
34	fi	31	fi
35	}	32	}
36		33
37	-