From d8ff69957ee1cecd45220f6efa509a084340afe3 Mon Sep 17 00:00:00 2001
From: James Slagle <jslagle@redhat.com>
Date: Fri, 8 May 2015 15:42:37 -0400
Subject: [PATCH] Remove install of vlan/vconfig from base

vconfig is actually deprecated in favor of the ip command, and is not
available on some newer distros (RHEL 7 at least). I'm not honestly sure
why it needs to be installed in all images anyway. I traced the origins
of installing the vlan package here all the way back to the first dib
git import from some other repo...so, I don't see any obvious reason why
it needs to be installed.

Change-Id: I272667cf29f5e41c217a26f70937b2842a04f748
---
 elements/base/install.d/00-baseline-environment | 2 +-
 elements/base/pkg-map                           | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/elements/base/install.d/00-baseline-environment b/elements/base/install.d/00-baseline-environment
index 9a02dbe05..e84c84be0 100755
--- a/elements/base/install.d/00-baseline-environment
+++ b/elements/base/install.d/00-baseline-environment
@@ -7,4 +7,4 @@ fi
 set -eu
 set -o pipefail
 
-install-packages -m base vlan_package iscsi_package
+install-packages -m base iscsi_package
diff --git a/elements/base/pkg-map b/elements/base/pkg-map
index 9c3a93daa..b09852deb 100644
--- a/elements/base/pkg-map
+++ b/elements/base/pkg-map
@@ -1,7 +1,6 @@
 {
   "family": {
     "redhat": {
-      "vlan_package": "vconfig",
       "iscsi_package": "iscsi-initiator-utils"
     },
     "suse": {
@@ -11,7 +10,6 @@
   "default": {
     "ccache_package": "ccache",
     "dkms_package": "dkms",
-    "vlan_package": "vlan",
     "iscsi_package": "open-iscsi"
   }
 }