diff options
| author | ajs124_desk <ajs@online.de> | 2014-03-01 21:42:52 +0100 |
|---|---|---|
| committer | Jouke Witteveen <j.witteveen@gmail.com> | 2014-03-01 22:17:13 +0100 |
| commit | 23ae1791917d48da7237d918f19dfa55a6a13d8f (patch) | |
| tree | 64348c1c6992705730c32d104b0064169d781155 | |
| parent | 965c476fd5cd10885a7708f0c111c51e697d6694 (diff) | |
| download | netctl-23ae1791917d48da7237d918f19dfa55a6a13d8f.tar.gz netctl-23ae1791917d48da7237d918f19dfa55a6a13d8f.tar.xz | |
port bonding from ifenslave to iproute2
Ifenslave is deprecated according to the kernel documentation:
https://www.kernel.org/doc/Documentation/networking/bonding.txt
It also added an additional, unnecessary dependency. I tried to update
the documentation to reflect this change.
| -rw-r--r-- | README | 1 | ||||
| -rw-r--r-- | contrib/PKGBUILD.in | 1 | ||||
| -rw-r--r-- | docs/netctl.profile.5.txt | 3 | ||||
| -rw-r--r-- | src/lib/connections/bond | 8 |
4 files changed, 4 insertions, 9 deletions
@@ -11,7 +11,6 @@ Optional: - dialog: for the interactive assistant - ifplugd: for automatic connection - wpa_actiond: for automatic connection -- ifenslave: for bonding support - bridge-utils: for bridge support For documentation generation: diff --git a/contrib/PKGBUILD.in b/contrib/PKGBUILD.in index 5375b36..22cddd8 100644 --- a/contrib/PKGBUILD.in +++ b/contrib/PKGBUILD.in @@ -16,7 +16,6 @@ optdepends=('dialog: for the menu based wifi assistant' 'wpa_supplicant: for wireless networking support' 'ifplugd: for automatic wired connections through netctl-ifplugd' 'wpa_actiond: for automatic wireless connections through netctl-auto' - 'ifenslave: for bond connections' 'ppp: for pppoe connections' ) source=(ftp://ftp.archlinux.org/other/packages/netctl/netctl-${pkgver}.tar.xz{,.sig}) diff --git a/docs/netctl.profile.5.txt b/docs/netctl.profile.5.txt index 649520b..623a24d 100644 --- a/docs/netctl.profile.5.txt +++ b/docs/netctl.profile.5.txt @@ -37,8 +37,7 @@ AVAILABLE CONNECTION TYPES For wireless connections. This connection type requires *wpa_supplicant* to be available. +bond+:: - Network bonding. This connection type requires *ifenslave* to be - available. + For bonded interfaces. +bridge+:: Network bridging. This connection type requires *brctl* to be available. diff --git a/src/lib/connections/bond b/src/lib/connections/bond index 9cc8b96..2909b90 100644 --- a/src/lib/connections/bond +++ b/src/lib/connections/bond @@ -1,8 +1,7 @@ -# Contributed by: Byron Williams <byron@112percent.com> +# Contributed by: andy123 <ajs@online.de> . "$SUBR_DIR/ip" -: ${IFENSLAVE:=ifenslave} declare -ag BindsToInterfaces bond_up() { @@ -15,8 +14,7 @@ bond_up() { bring_interface_up "$Interface" for slave in "${BindsToInterfaces[@]}"; do - bring_interface_up "$slave" - $IFENSLAVE "$Interface" "$slave" + ip link set dev "$slave" master "$Interface" done ip_set @@ -24,7 +22,7 @@ bond_up() { bond_down() { for slave in "${BindsToInterfaces[@]}"; do - $IFENSLAVE "$Interface" -d "$slave" + ip link set dev "$slave" nomaster done ip_unset |