Attachment 455354 Details for Bug 722304

[patch] NM_ONLINE_TIMEOUT default setting, updated migration hook

0001-Changed-NM_ONLINE_TIMEOUT-default-to-0.patch (text/plain), 2.69 KB, created by Marius Tomaschewski on 2011-10-10 11:15:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marius Tomaschewski

Created: 2011-10-10 11:15:56 UTC

Size: 2.69 KB

patch

obsolete

>From c4d5cfcf4ce8d8e592a34b64b507e6a3f38c9be7 Mon Sep 17 00:00:00 2001
>From: Marius Tomaschewski <mt@suse.com>
>Date: Mon, 10 Oct 2011 13:13:49 +0200
>Subject: [PATCH] Changed NM_ONLINE_TIMEOUT default to 0
>
>Changed NM_ONLINE_TIMEOUT default back to 0 to avoid
>unneeded waiting for NM interfaces at boot (bnc#722304)
>
>Signed-off-by: Marius Tomaschewski <mt@suse.com>
>---
> config/sysconfig.config-network |    4 ++--
> sysconfig.spec.in               |   12 ++++++------
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
>diff --git a/config/sysconfig.config-network b/config/sysconfig.config-network
>index 1f8d05a..38e3eb1 100644
>--- a/config/sysconfig.config-network
>+++ b/config/sysconfig.config-network
>@@ -226,7 +226,7 @@ IFPLUGD_OPTIONS="-f -I -b"
> NETWORKMANAGER=no
> 
> ## Type:	int
>-## Default:	30
>+## Default:	0
> #
> # When using NetworkManager you may define a timeout to wait for NetworkManager
> # to connect in /etc/init.d/network(-remotefs) script.  Other network services
>@@ -234,7 +234,7 @@ NETWORKMANAGER=no
> # 
> # This variable has no effect if NETWORKMANAGER=no.
> #
>-NM_ONLINE_TIMEOUT="30"
>+NM_ONLINE_TIMEOUT="0"
> 
> ## Type:        string
> ## Default:     "dns-resolver dns-bind ntp-runtime nis"
>diff --git a/sysconfig.spec.in b/sysconfig.spec.in
>index f559763..2c144f1 100644
>--- a/sysconfig.spec.in
>+++ b/sysconfig.spec.in
>@@ -119,13 +119,12 @@ if [ ${1:-0} -gt 1 ]; then
> 	if [ ! -f etc/sysconfig/network/scripts/move_shm_sysconfig.sh ] ; then
> 		touch etc/sysconfig/network/__move_shm_sysconfig__
> 	fi
>-	# set a mark when updating from NM_ONLINE_TIMEOUT=0
>+	# remember previous NM_ONLINE_TIMEOUT setting
> 	eval NM_ONLINE_TIMEOUT='' \
> 		`grep -s '^[[:space:]]*NM_ONLINE_TIMEOUT=' \
> 		var/adm/fillup-templates/sysconfig.config-network`
>-	if [ "x$NM_ONLINE_TIMEOUT" = "x0" ] ; then
>-		touch etc/sysconfig/network/__nm_online_timeout__
>-	fi
>+	echo "OLD_NM_ONLINE_TIMEOUT=$NM_ONLINE_TIMEOUT" \
>+		> etc/sysconfig/network/__nm_online_timeout__
> fi
> 
> %post 
>@@ -144,13 +143,14 @@ fi
> %{fillup_and_insserv -fY network-remotefs}
> # remove first, we need the new default value
> sysconfig_remove_and_set network/dhcp DHCLIENT_TIMEOUT
>-# remove first when NM_ONLINE_TIMEOUT was 0 in old template
>+# 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" = "x0" ] && \
>+	[ "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}
>-- 
>1.7.3.4
>

Actions: View | Diff

Attachments on bug 722304: 455354 | 457474