File sysconfig-nm-online-timeout-0-default.patch of Package sysconfig

Overview Repositories Revisions Requests Users Attributes Meta

File sysconfig-nm-online-timeout-0-default.patch of Package sysconfig (Revision 763b384a268aabe6e3461c896c3ff33b)

Currently displaying revision 763b384a268aabe6e3461c896c3ff33b , Show latest

From 578a4f46906883e376ec36261bdaee4e823421da 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               |   18 ------------------
 2 files changed, 2 insertions(+), 20 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..b64d677 100644
--- a/sysconfig.spec.in
+++ b/sysconfig.spec.in
@@ -119,13 +119,6 @@ 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
-	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
 fi
 
 %post 
@@ -142,17 +135,6 @@ fi
 #
 %{fillup_and_insserv -fY network}
 %{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
-if [ -f etc/sysconfig/network/__nm_online_timeout__ ] ; then
-	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" ] && \
-	sysconfig_remove_and_set network/config NM_ONLINE_TIMEOUT
-fi
 %{fillup_only -dns dhcp network network}
 %{fillup_only -dns config network network}
 /sbin/ldconfig
-- 
1.7.3.4

Places

File sysconfig-nm-online-timeout-0-default.patch of Package sysconfig (Revision 763b384a268aabe6e3461c896c3ff33b)

Places