File 0001-Do-not-check-renamed-flag-when-udev-is-not... of Package sysconfig

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Do-not-check-renamed-flag-when-udev-is-not-running.patch of Package sysconfig (Revision 0fefbabcb747eb105325b4a473d27100)

Currently displaying revision 0fefbabcb747eb105325b4a473d27100 , Show latest

From dbdc2e2a2b0288deefc74f838f5c3fa0b466a4f6 Mon Sep 17 00:00:00 2001
From: Marius Tomaschewski <mt@suse.com>
Date: Thu, 19 Jul 2012 15:43:11 +0200
Subject: [PATCH] Do not check renamed-flag when udev is not running

When udev is not running as in LXC containers, do not check for
the interface renamed-flag set by udev rules and causing to wait
until udev rename finished or report a network start failure.
The reintroduced FORCE_PERSISTENT_NAMES network/config variable
allows an explicit behavior configuration (bnc#771615).
---
 config/sysconfig.config-network |    9 +++++++++
 scripts/network                 |   13 ++++++++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/config/sysconfig.config-network b/config/sysconfig.config-network
index 38e3eb1..725f3c5 100644
--- a/config/sysconfig.config-network
+++ b/config/sysconfig.config-network
@@ -143,6 +143,15 @@ MANDATORY_DEVICES=""
 #
 WAIT_FOR_INTERFACES="30"
 
+## Type:        list("",yes,no)
+## Default:     ""
+#
+# Forces all interfaces eth* ath* wlan* and ra* to be persistent via udev
+# or disables the persistent rename flag check. Default is to check if udev
+# is running -- it may be not used, e.g. inside of LXC containers.
+#
+FORCE_PERSISTENT_NAMES=""
+
 ## Type:        integer
 ## Default:     0
 #
diff --git a/scripts/network b/scripts/network
index 9928da6..3f4fe2c 100755
--- a/scripts/network
+++ b/scripts/network
@@ -507,13 +507,24 @@ done
 # is ready to be set up. If an it is not ready now, it will be set up via
 # udev/ifup (because network is started now). We will just have to wait for it
 # later in the start section if it is considered mandatory (see next section).
+#
+# When udev is not in use / started,  e.g. inside of LXC container, then the
+# 'renamed' flag will be never set and we don't need to check it -- except
+# when there is an explicit configuration telling how to behave here.
+#
+if /sbin/checkproc /sbin/udevd &>/dev/null ; then
+	FORCE_PERSISTENT_NAMES=${FORCE_PERSISTENT_NAMES:-yes}
+else
+	FORCE_PERSISTENT_NAMES=${FORCE_PERSISTENT_NAMES:-no}
+fi
 for a in $(type_filter `ls -A /sys/class/net/`); do
 	test -d /sys/class/net/$a || continue
 	t=`get_iface_type $a`
 	case "$t" in
 		eth|tr|ib|wlan)
 			STAMPFILE=$STAMPFILE_STUB`cat /sys/class/net/$a/ifindex`
-			if [ "$MODE" = onboot -a "$ACTION" = start ] ; then
+			if [ "$MODE" = onboot -a "$ACTION" = start -a \
+			     "${FORCE_PERSISTENT_NAMES}" = yes ] ; then
 				# skip interfaces (with active drivers)
 				# but not yet prepared by an
 				#   ifup -o hotplug
-- 
1.7.7

Places

File 0001-Do-not-check-renamed-flag-when-udev-is-not-running.patch of Package sysconfig (Revision 0fefbabcb747eb105325b4a473d27100)

Places