From 74487a383ccafce3f13c4d595727241958a7974e Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Thu, 18 Feb 2016 13:20:48 +0000
Subject: [PATCH] Depend on ifupdown in simple-init

Newer distros, such as debian jessie and ubuntu xenial, do not provide
ifupdown by default, but simple-init depends on it. Add it to the pile.

Change-Id: I6f4876863c67c65a82464d4e0593015cdc839c5c
---
 elements/dib-init-system/dib-init-system   | 6 +++---
 elements/simple-init/package-installs.yaml | 1 +
 elements/simple-init/pkg-map               | 6 ++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/elements/dib-init-system/dib-init-system b/elements/dib-init-system/dib-init-system
index 6953c935..e5213dc2 100755
--- a/elements/dib-init-system/dib-init-system
+++ b/elements/dib-init-system/dib-init-system
@@ -6,7 +6,9 @@ fi
 set -eu
 set -o pipefail
 
-if [[ -f /sbin/initctl ]]; then
+if [[ -f /usr/bin/systemctl ]]; then
+    echo "systemd"
+elif [[ -f /sbin/initctl ]]; then
     echo "upstart"
 elif [[ -f /etc/gentoo-release ]]; then
     if [[ "${GENTOO_PROFILE}" =~ systemd ]]; then
@@ -14,8 +16,6 @@ elif [[ -f /etc/gentoo-release ]]; then
     else
         echo "openrc"
     fi
-elif [[ -f /usr/bin/systemctl ]]; then
-    echo "systemd"
 elif [[ -f /sbin/init ]]; then
     if [[ -f /bin/systemd ]]; then
         echo "systemd"
diff --git a/elements/simple-init/package-installs.yaml b/elements/simple-init/package-installs.yaml
index 6fcfc620..780572e5 100644
--- a/elements/simple-init/package-installs.yaml
+++ b/elements/simple-init/package-installs.yaml
@@ -1,2 +1,3 @@
 isc-dhcp-client:
 net-tools:
+ifupdown:
diff --git a/elements/simple-init/pkg-map b/elements/simple-init/pkg-map
index 4dbdff8c..ee3e372a 100644
--- a/elements/simple-init/pkg-map
+++ b/elements/simple-init/pkg-map
@@ -4,7 +4,8 @@
       "isc-dhcp-client": "dhclient"
     },
     "debian": {
-      "isc-dhcp-client": "isc-dhcp-client"
+      "isc-dhcp-client": "isc-dhcp-client",
+      "ifupdown": "ifupdown"
     },
     "gentoo": {
       "isc-dhcp-client": "net-misc/dhcp",
@@ -13,6 +14,7 @@
     }
   },
   "default": {
-    "isc-dhcp-client": "isc-dhcp-client"
+    "isc-dhcp-client": "isc-dhcp-client",
+    "ifupdown": ""
   }
 }