]> TLD Linux GIT Repositories - packages/rc-scripts.git/blobdiff - rc-scripts-net-bond.patch
TLD / packages / rc-scripts.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- updated for 0.4.13
[packages/rc-scripts.git] / rc-scripts-net-bond.patch
diff --git a/rc-scripts-net-bond.patch b/rc-scripts-net-bond.patch
index 22b7047b111f55b9adef142269acdbdfccb61fd1..3d401ee00792f05087603f5d6eaa17bce331cfbb 100644 (file)
--- a/rc-scripts-net-bond.patch
+++ b/rc-scripts-net-bond.patch
@@ -1,35 +1,21 @@
-diff -urN rc-scripts-0.4.12.orig/lib/ifdown rc-scripts-0.4.12/lib/ifdown
---- rc-scripts-0.4.12.orig/lib/ifdown  2014-06-10 06:55:19.000000000 +0000
-+++ rc-scripts-0.4.12/lib/ifdown       2014-07-12 18:44:23.637000000 +0000
-@@ -118,25 +118,6 @@
+diff -urNp rc-scripts-0.4.13.orig/lib/ifdown rc-scripts-0.4.13/lib/ifdown
+--- rc-scripts-0.4.13.orig/lib/ifdown  2015-01-22 16:01:18.000000000 +0000
++++ rc-scripts-0.4.13/lib/ifdown       2015-02-06 13:44:37.910314244 +0000
+@@ -118,11 +118,6 @@ if [ -n "${SUBDEVICE}" ]; then
        ip addr del ${IP4ADDR} label ${SUBDEVICE} dev ${DEVICE}
  else
        LC_ALL=C ip addr flush dev ${DEVICE} 2>&1 | grep -v "Nothing to flush"
 -
--      if [ ${DEVICETYPE} = "bond" ]; then
--              if [ ! -x /sbin/ifenslave ]; then
--                      nls "%s is missing. Can't continue." "/sbin/ifenslave"
--                      exit 1
--              fi
--
--              # get up the bonding device before enslaving
--              if ! check_device_down "${DEVICE}"; then
--                      ip link set ${DEVICE} up
--              fi
--
--              for BSVAR in $(awk '/Slave Interface:/{ print $3}' /proc/net/bonding/${DEVICE}); do
--                      if [ "${BSVAR}" ]; then
--                              ifenslave -d ${DEVICE} $BSVAR
--                      fi
--              done
--      fi
+-    if is_yes "$SLAVE"; then
+-        ip link set ${DEVICE} nomaster
+-    fi
 -
        ip link set ${DEVICE} down
  fi
  
-diff -urN rc-scripts-0.4.12.orig/lib/ifdown-bond rc-scripts-0.4.12/lib/ifdown-bond
---- rc-scripts-0.4.12.orig/lib/ifdown-bond     1970-01-01 00:00:00.000000000 +0000
-+++ rc-scripts-0.4.12/lib/ifdown-bond  2014-07-12 22:00:34.509000000 +0000
+diff -urNp rc-scripts-0.4.13.orig/lib/ifdown-bond rc-scripts-0.4.13/lib/ifdown-bond
+--- rc-scripts-0.4.13.orig/lib/ifdown-bond     1970-01-01 00:00:00.000000000 +0000
++++ rc-scripts-0.4.13/lib/ifdown-bond  2015-02-06 13:42:15.348314244 +0000
 @@ -0,0 +1,54 @@
 +#!/bin/sh
 +#
@@ -85,37 +71,30 @@ diff -urN rc-scripts-0.4.12.orig/lib/ifdown-bond rc-scripts-0.4.12/lib/ifdown-bo
 +              exit 1
 +      fi
 +fi
-diff -urN rc-scripts-0.4.12.orig/lib/ifup rc-scripts-0.4.12/lib/ifup
---- rc-scripts-0.4.12.orig/lib/ifup    2014-06-10 06:55:19.000000000 +0000
-+++ rc-scripts-0.4.12/lib/ifup 2014-07-12 21:58:42.147000000 +0000
-@@ -89,18 +89,12 @@
-       exit 1
+diff -urNp rc-scripts-0.4.13.orig/lib/ifup rc-scripts-0.4.13/lib/ifup
+--- rc-scripts-0.4.13.orig/lib/ifup    2015-01-22 16:01:18.000000000 +0000
++++ rc-scripts-0.4.13/lib/ifup 2015-02-06 13:51:40.208314244 +0000
+@@ -120,11 +120,12 @@ if [ -n "$ETHTOOL_OPTS" ] ; then
  fi
  
--if is_yes "$SLAVE" && [ ! -x /sbin/ifenslave ]; then
--      nls "%s is missing. Can't continue." "/sbin/ifenslave"
--      exit 1
--fi
--
--if is_yes "$SLAVE" && [ -n "$MASTER" -a -x /sbin/ifenslave ]; then
--      RFLAG="" && is_yes "${RECIEVE-ONLY}" && RFLAG="-r"
+ if is_yes "$SLAVE" && [ -n "$MASTER" ] ; then
+-    nls "Enslaving %s to %s" "$DEVICE" "$MASTER"
+-    ip link set "$DEVICE" master "$MASTER"
+-    ip link set "$DEVICE" up
 -
--      ip link set ${DEVICE} down
--      nls "Enslaving %s to %s" "$DEVICE" "$MASTER"
--      ifenslave $RFLAG "$MASTER" "$DEVICE"
--
-+if is_yes "$SLAVE" && [ -n "$MASTER" ]; then
+-    exit 0
 +      if ! grep -wq "${DEVICE}" /sys/class/net/${MASTER}/bonding/slaves 2>/dev/null; then
 +              nls "Enslaving %s to %s" "$DEVICE" "$MASTER"
 +              ip link set dev ${DEVICE} down
 +              echo "+${DEVICE}" > /sys/class/net/${MASTER}/bonding/slaves 2>/dev/null
 +      fi
-       if [ -n "$ETHTOOL_OPTS" ] ; then
-               /sbin/ethtool -s $DEVICE $ETHTOOL_OPTS
-       fi
-diff -urN rc-scripts-0.4.12.orig/lib/ifup-bond rc-scripts-0.4.12/lib/ifup-bond
---- rc-scripts-0.4.12.orig/lib/ifup-bond       1970-01-01 00:00:00.000000000 +0000
-+++ rc-scripts-0.4.12/lib/ifup-bond    2014-07-12 22:08:02.953000000 +0000
++      exit 0
+ fi
+ 
+ if [ "$HANDLING" = "2" ]; then
+diff -urNp rc-scripts-0.4.13.orig/lib/ifup-bond rc-scripts-0.4.13/lib/ifup-bond
+--- rc-scripts-0.4.13.orig/lib/ifup-bond       1970-01-01 00:00:00.000000000 +0000
++++ rc-scripts-0.4.13/lib/ifup-bond    2015-02-06 13:42:15.349314244 +0000
 @@ -0,0 +1,75 @@
 +#!/bin/sh
 +#
@@ -192,10 +171,10 @@ diff -urN rc-scripts-0.4.12.orig/lib/ifup-bond rc-scripts-0.4.12/lib/ifup-bond
 +              echo $value > /sys/class/net/${DEVICE}/bonding/$key
 +      fi
 +done
-diff -urN rc-scripts-0.4.12.orig/lib/Makefile.am rc-scripts-0.4.12/lib/Makefile.am
---- rc-scripts-0.4.12.orig/lib/Makefile.am     2013-11-02 20:50:20.000000000 +0000
-+++ rc-scripts-0.4.12/lib/Makefile.am  2014-07-12 22:01:57.571000000 +0000
-@@ -10,6 +10,7 @@
+diff -urNp rc-scripts-0.4.13.orig/lib/Makefile.am rc-scripts-0.4.13/lib/Makefile.am
+--- rc-scripts-0.4.13.orig/lib/Makefile.am     2013-11-02 20:50:20.000000000 +0000
++++ rc-scripts-0.4.13/lib/Makefile.am  2015-02-06 13:42:15.349314244 +0000
+@@ -10,6 +10,7 @@ sbin_SCRIPTS = \
  scriptsdir = @exec_prefix@/lib/$(PACKAGE)
  
  scripts_SCRIPTS = \
@@ -203,7 +182,7 @@ diff -urN rc-scripts-0.4.12.orig/lib/Makefile.am rc-scripts-0.4.12/lib/Makefile.
        ifdown-br \
        ifdown-irda \
        ifdown-ppp \
-@@ -17,6 +18,7 @@
+@@ -17,6 +18,7 @@ scripts_SCRIPTS = \
        ifdown-sl \
        ifdown-vlan \
        ifup-aliases \
@@ -211,10 +190,10 @@ diff -urN rc-scripts-0.4.12.orig/lib/Makefile.am rc-scripts-0.4.12/lib/Makefile.
        ifup-br \
        ifup-ipx \
        ifup-irda \
-diff -urN rc-scripts-0.4.12.orig/lib/Makefile.in rc-scripts-0.4.12/lib/Makefile.in
---- rc-scripts-0.4.12.orig/lib/Makefile.in     2014-07-12 11:45:17.000000000 +0000
-+++ rc-scripts-0.4.12/lib/Makefile.in  2014-07-12 22:01:50.605000000 +0000
-@@ -256,6 +256,7 @@
+diff -urNp rc-scripts-0.4.13.orig/lib/Makefile.in rc-scripts-0.4.13/lib/Makefile.in
+--- rc-scripts-0.4.13.orig/lib/Makefile.in     2015-01-22 16:02:57.000000000 +0000
++++ rc-scripts-0.4.13/lib/Makefile.in  2015-02-06 13:42:15.350314244 +0000
+@@ -256,6 +256,7 @@ sbin_SCRIPTS = \
  #scriptsdir = @networkscriptsdir@
  scriptsdir = @exec_prefix@/lib/$(PACKAGE)
  scripts_SCRIPTS = \
@@ -222,7 +201,7 @@ diff -urN rc-scripts-0.4.12.orig/lib/Makefile.in rc-scripts-0.4.12/lib/Makefile.
        ifdown-br \
        ifdown-irda \
        ifdown-ppp \
-@@ -263,6 +264,7 @@
+@@ -263,6 +264,7 @@ scripts_SCRIPTS = \
        ifdown-sl \
        ifdown-vlan \
        ifup-aliases \
inittab and /etc/rc.d scripts