You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
29 lines
813 B
29 lines
813 B
6 years ago
|
From 962bb116632480313c4b5094e554926968d8b946 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Vasiliy Tolstov <v.tolstov@selfip.ru>
|
||
|
|
Date: Mon, 26 May 2014 15:28:43 +0400
|
||
|
|
Subject: [PATCH] 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.
|
||
|
|
|
||
|
|
(cherry picked from commit 28f3f537c4ffb101c26def41c9a6a0278f9b4437)
|
||
|
|
---
|
||
|
|
modules.d/40network/ifup.sh | 1 +
|
||
|
|
1 file changed, 1 insertion(+)
|
||
|
|
|
||
|
|
diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
|
||
|
|
index fd84e4cd..79127f24 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
|