From: Vasiliy Tolstov <v.tolstov@selfip.ru>
Date: Mon, 26 May 2014 11:28:43 +0000 (+0400)
Subject: network/ifup.sh: Don't try to modprobe ipv6, if already available
X-Git-Tag: 038~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=28f3f537c4ffb101c26def41c9a6a0278f9b4437;p=thirdparty%2Fdracut.git

network/ifup.sh: Don't try to modprobe ipv6, if already available

Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>

[Edited-by: Harald Hoyer]
Simplified logic.
---

diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
index 2e762ac9a..349530f42 100755
--- a/modules.d/40network/ifup.sh
+++ b/modules.d/40network/ifup.sh
@@ -106,6 +106,7 @@ do_dhcp() {
 }
 
 load_ipv6() {
+    [ -d /proc/sys/net/ipv6 ] && return
     modprobe ipv6
     i=0
     while [ ! -d /proc/sys/net/ipv6 ]; do