Ubuntu Pastebin

Paste from dimitern at Mon, 20 Jun 2016 11:43:18 +0000

Download as text
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
diff --git a/etc/network/if-post-down.d/ifenslave b/etc/network/if-post-down.d/ifenslave
index e972940..a192ca5 100755
--- a/etc/network/if-post-down.d/ifenslave
+++ b/etc/network/if-post-down.d/ifenslave
@@ -2,6 +2,8 @@
 
 [ "$VERBOSITY" = 1 ] && set -x
 
+[ "$ADDRFAM" = meta ] && exit 0
+
 sysfs()
 {
 	# Called with :
@@ -25,7 +27,6 @@ sysfs_remove_all()
 }
 
 BOND_PARAMS="/sys/class/net/$IFACE/bonding"
-IFSTATE=/etc/network/run/ifstate
 
 # free $IFACE if it is currently enslaved to a bonding device.
 if [ -f "/sys/class/net/$IFACE/master/bonding/slaves" ] ; then
@@ -53,9 +54,8 @@ sysfs_remove_all arp_ip_target
 [ "$VERBOSITY" = 1 ] && v=-v
 read slaves < "$BOND_PARAMS/slaves"
 for slave in $slaves ; do
-	# If $slave is currently up in $IFSTATE, then bring it down, to keep $IFSTATE consistent.
 	# This is supposed to have the side effect of freeing the interface.
-	grep -q "^$slave=" $IFSTATE && ifdown $v $slave
+	ifquery --state $slave && ifdown $v $slave
 
 	# Anyway, ensure $slave is free.
 	if [ -f "/sys/class/net/$slave/master/bonding/slaves" ] ; then
diff --git a/etc/network/if-pre-up.d/ifenslave b/etc/network/if-pre-up.d/ifenslave
index 439204f..a545f10 100755
--- a/etc/network/if-pre-up.d/ifenslave
+++ b/etc/network/if-pre-up.d/ifenslave
@@ -2,7 +2,7 @@
 
 [ "$VERBOSITY" = 1 ] && set -x
 
-IFSTATE=/etc/network/run/ifstate
+[ "$ADDRFAM" = meta ] && exit 0
 
 add_master()
 {
@@ -89,7 +89,7 @@ enslave_slaves()
 
 	[ "$VERBOSITY" = 1 ] && v=-v
 	for slave in $BOND_SLAVES ; do
-		if ( [ "$AUTOIF" ] && grep -q "^$slave=" $IFSTATE ) ; then
+		if ( [ "$AUTOIF" ] && ifquery --state $slave ) ; then
 			echo "Not enslaving interface $slave since it is already configured"
 		else
 			# Ensure $slave is down.
diff --git a/etc/network/if-up.d/ifenslave b/etc/network/if-up.d/ifenslave
index 8757d97..4d83751 100755
--- a/etc/network/if-up.d/ifenslave
+++ b/etc/network/if-up.d/ifenslave
@@ -2,6 +2,8 @@
 
 [ "$VERBOSITY" = 1 ] && set -x
 
+[ "$ADDRFAM" = meta ] && exit 0
+
 sysfs()
 {
 	# Called with :
Download as text