From a2a384774e5d21fc666e932ce4a6d7c868097dea Mon Sep 17 00:00:00 2001
From: Guillem Jover <gjover@sipwise.com>
Date: Tue, 22 Dec 2015 15:47:19 +0100
Subject: [PATCH] MT#17077 Install ifenslave instead of ifenslave-2.6 on
 jessie+ systems

The latter is a transitional dummy package that will be going away in
the near future. Switch to it now, instead of waiting for the inevitable.
Also this way we get less cruft on the installed system.

Change-Id: I6679d3eafed07548dfebf0dc8a5b2fe75a5ef58d
---
 deployment.sh | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/deployment.sh b/deployment.sh
index b6963f6..31fe53c 100755
--- a/deployment.sh
+++ b/deployment.sh
@@ -1195,9 +1195,8 @@ acpi acpid acpi-support-base
 # be able to login on the system, even if just installing plain Debian
 openssh-server
 
-# support bridge / bonding / vlan
+# support bridge / vlan
 bridge-utils
-ifenslave-2.6
 vlan
 
 # MT#13637 support https in sources.list
@@ -1212,6 +1211,22 @@ apt-transport-https
 #os-prober
 EOF
 
+# ifenslave-2.6 in jessie+ is a transitional dummy package that will disappear.
+case "$DEBIAN_RELEASE" in
+  lenny|squeeze|wheezy)
+    PKG_IFENSLAVE="ifenslave-2.6"
+    ;;
+  *)
+    PKG_IFENSLAVE="ifenslave"
+    ;;
+esac
+echo  "Adding ${PKG_IFENSLAVE} package (because we're installing ${DEBIAN_RELEASE})"
+logit "Adding ${PKG_IFENSLAVE} package (because we're installing ${DEBIAN_RELEASE})"
+cat >> /etc/debootstrap/packages << EOF
+# support bonding
+${PKG_IFENSLAVE}
+EOF
+
 # MT#8813 The linux-headers-2.6-amd64 package doesn't exist in jessie and newer
 case "$DEBIAN_RELEASE" in
   lenny|squeeze|wheezy)