Attachment #455354 for bug #722304

View | Details | Raw Unified | Return to bug 722304
Collapse All | Expand All

Lines 226-232 IFPLUGD_OPTIONS="-f -I -b" Link Here

(-)a/config/sysconfig.config-network (-2 / +2 lines)
226	NETWORKMANAGER=no	226	NETWORKMANAGER=no
227		227
228	## Type: int	228	## Type: int
229	## Default: 30	229	## Default: 0
230	#	230	#
231	# When using NetworkManager you may define a timeout to wait for NetworkManager	231	# When using NetworkManager you may define a timeout to wait for NetworkManager
232	# to connect in /etc/init.d/network(-remotefs) script. Other network services	232	# to connect in /etc/init.d/network(-remotefs) script. Other network services
Lines 234-240 NETWORKMANAGER=no Link Here
234	#	234	#
235	# This variable has no effect if NETWORKMANAGER=no.	235	# This variable has no effect if NETWORKMANAGER=no.
236	#	236	#
237	NM_ONLINE_TIMEOUT="30"	237	NM_ONLINE_TIMEOUT="0"
238		238
239	## Type: string	239	## Type: string
240	## Default: "dns-resolver dns-bind ntp-runtime nis"	240	## Default: "dns-resolver dns-bind ntp-runtime nis"




	if [ ! -f etc/sysconfig/network/scripts/move_shm_sysconfig.sh ] ; then
		touch etc/sysconfig/network/__move_shm_sysconfig__
	fi
	# remember previous NM_ONLINE_TIMEOUT setting
	eval NM_ONLINE_TIMEOUT='' \
		`grep -s '^[[:space:]]*NM_ONLINE_TIMEOUT=' \
		var/adm/fillup-templates/sysconfig.config-network`
	echo "OLD_NM_ONLINE_TIMEOUT=$NM_ONLINE_TIMEOUT" \
		> etc/sysconfig/network/__nm_online_timeout__
	fi
fi

%post 

%{fillup_and_insserv -fY network-remotefs}
# remove first, we need the new default value
sysconfig_remove_and_set network/dhcp DHCLIENT_TIMEOUT
# remove NM_ONLINE_TIMEOUT when it is set to old default
if [ -f etc/sysconfig/network/__nm_online_timeout__ ] ; then
	. etc/sysconfig/network/__nm_online_timeout__
	rm -f etc/sysconfig/network/__nm_online_timeout__
	eval NM_ONLINE_TIMEOUT='' \
		`grep -s '^[[:space:]]*NM_ONLINE_TIMEOUT=' \
		etc/sysconfig/network/config`
	[ "x$NM_ONLINE_TIMEOUT" = "x$OLD_NM_ONLINE_TIMEOUT" ] && \
	sysconfig_remove_and_set network/config NM_ONLINE_TIMEOUT
fi
%{fillup_only -dns dhcp network network}
- 

Return to bug 722304

Lines 119-131 if [ ${1:-0} -gt 1 ]; then Link Here

(-)a/sysconfig.spec.in (-7 / +6 lines)
119	if [ ! -f etc/sysconfig/network/scripts/move_shm_sysconfig.sh ] ; then	119	if [ ! -f etc/sysconfig/network/scripts/move_shm_sysconfig.sh ] ; then
120	touch etc/sysconfig/network/__move_shm_sysconfig__	120	touch etc/sysconfig/network/__move_shm_sysconfig__
121	fi	121	fi
122	# set a mark when updating from NM_ONLINE_TIMEOUT=0	122	# remember previous NM_ONLINE_TIMEOUT setting
123	eval NM_ONLINE_TIMEOUT='' \	123	eval NM_ONLINE_TIMEOUT='' \
124	`grep -s '^[[:space:]]*NM_ONLINE_TIMEOUT=' \	124	`grep -s '^[[:space:]]*NM_ONLINE_TIMEOUT=' \
125	var/adm/fillup-templates/sysconfig.config-network`	125	var/adm/fillup-templates/sysconfig.config-network`
126	if [ "x$NM_ONLINE_TIMEOUT" = "x0" ] ; then	126	echo "OLD_NM_ONLINE_TIMEOUT=$NM_ONLINE_TIMEOUT" \
127	touch etc/sysconfig/network/__nm_online_timeout__	127	> etc/sysconfig/network/__nm_online_timeout__
128	fi
129	fi	128	fi
130		129
131	%post	130	%post
Lines 144-156 fi Link Here
144	%{fillup_and_insserv -fY network-remotefs}	143	%{fillup_and_insserv -fY network-remotefs}
145	# remove first, we need the new default value	144	# remove first, we need the new default value
146	sysconfig_remove_and_set network/dhcp DHCLIENT_TIMEOUT	145	sysconfig_remove_and_set network/dhcp DHCLIENT_TIMEOUT
147	# remove first when NM_ONLINE_TIMEOUT was 0 in old template	146	# remove NM_ONLINE_TIMEOUT when it is set to old default
148	if [ -f etc/sysconfig/network/__nm_online_timeout__ ] ; then	147	if [ -f etc/sysconfig/network/__nm_online_timeout__ ] ; then
		148	. etc/sysconfig/network/__nm_online_timeout__
149	rm -f etc/sysconfig/network/__nm_online_timeout__	149	rm -f etc/sysconfig/network/__nm_online_timeout__
150	eval NM_ONLINE_TIMEOUT='' \	150	eval NM_ONLINE_TIMEOUT='' \
151	`grep -s '^[[:space:]]*NM_ONLINE_TIMEOUT=' \	151	`grep -s '^[[:space:]]*NM_ONLINE_TIMEOUT=' \
152	etc/sysconfig/network/config`	152	etc/sysconfig/network/config`
153	[ "x$NM_ONLINE_TIMEOUT" = "x0" ] && \	153	[ "x$NM_ONLINE_TIMEOUT" = "x$OLD_NM_ONLINE_TIMEOUT" ] && \
154	sysconfig_remove_and_set network/config NM_ONLINE_TIMEOUT	154	sysconfig_remove_and_set network/config NM_ONLINE_TIMEOUT
155	fi	155	fi
156	%{fillup_only -dns dhcp network network}	156	%{fillup_only -dns dhcp network network}
157	-