Attachment 873067 Details for Bug 1068621 – patch

[patch] patch

0001-network-try-to-not-compete-with-NM-during-boot.patch (text/plain), 1.93 KB, created by Lukáš Nykrýn on 2014-03-11 11:34:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lukáš Nykrýn

Created: 2014-03-11 11:34:46 UTC

Size: 1.93 KB

patch

obsolete

>From aaa2421f742ba06bc30059fdde601ca951b31b91 Mon Sep 17 00:00:00 2001
>From: Lukas Nykryn <lnykryn@redhat.com>
>Date: Thu, 27 Feb 2014 11:44:46 +0100
>Subject: [PATCH] network: try to not compete with NM during boot
>
>---
> rc.d/init.d/network                         | 2 +-
> sysconfig/network-scripts/ifup              | 1 +
> sysconfig/network-scripts/network-functions | 5 +++++
> 3 files changed, 7 insertions(+), 1 deletion(-)
>
>diff --git a/rc.d/init.d/network b/rc.d/init.d/network
>index e48c99b..56c59f7 100755
>--- a/rc.d/init.d/network
>+++ b/rc.d/init.d/network
>@@ -8,7 +8,7 @@
> #
> ### BEGIN INIT INFO
> # Provides: $network
>-# Should-Start: iptables ip6tables
>+# Should-Start: iptables ip6tables NetworkManager-wait-online NetworkManager
> # Short-Description: Bring up/down networking
> # Description: Bring up/down networking
> ### END INIT INFO
>diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
>index d16eca6..278fde3 100755
>--- a/sysconfig/network-scripts/ifup
>+++ b/sysconfig/network-scripts/ifup
>@@ -69,6 +69,7 @@ if [ "$_use_nm" = "true" -a -n "$UUID" ]; then
>     if [ "foo$2" = "fooboot" ] && [ "${TYPE}" = "Wireless" ]; then
>         exit 0
>     fi
>+    is_nm_handling ${DEVICE} && exit 0
>     nmcli con up uuid "$UUID"
>     exit $?
> fi
>diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
>index 1e45924..85e2502 100644
>--- a/sysconfig/network-scripts/network-functions
>+++ b/sysconfig/network-scripts/network-functions
>@@ -280,6 +280,11 @@ is_nm_active ()
>     LANG=C nmcli -t --fields device,state  dev status 2>/dev/null | grep -q "^${1}:connected$"
> }
> 
>+is_nm_handling ()
>+{
>+    LANG=C nmcli -t --fields device,state  dev status 2>/dev/null | grep -q "^$${1}:connected$\|$${1}connecting$$"
>+}
>+
> is_nm_device_unmanaged ()
> {
>     LANG=C nmcli -t --fields GENERAL dev show "${1}"  2>/dev/null | awk -F ':' '/GENERAL.STATE/ { if ($2 == "unmanaged") exit 0 ; else exit 1; }'
>-- 
>1.8.5.3
>

Actions: View | Diff

Attachments on bug 1068621: 867570 | 870605 | 873067