From 11128b06739c7c592644dbac287aa2f5c0901a4b Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Fri, 1 Apr 2016 11:12:29 +1100
Subject: [PATCH] Use generic "dhcp-client" name
Every platform has a different name for their DHCP client, so use a
generic name "dhcp-client" in the package name and let everyone choose
their sub-name. This also brings some consistency across simple-init
& dhcp-all-interfaces
Change-Id: I797aa7aacb13dfb7f35700463dc11d55552eb108
---
elements/dhcp-all-interfaces/package-installs.yaml | 2 +-
elements/dhcp-all-interfaces/pkg-map | 7 +++----
elements/simple-init/package-installs.yaml | 2 +-
elements/simple-init/pkg-map | 8 ++++----
4 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/elements/dhcp-all-interfaces/package-installs.yaml b/elements/dhcp-all-interfaces/package-installs.yaml
index b1f71dfa9..98034e6c1 100644
--- a/elements/dhcp-all-interfaces/package-installs.yaml
+++ b/elements/dhcp-all-interfaces/package-installs.yaml
@@ -1 +1 @@
-dhcpcd:
+dhcp-client:
diff --git a/elements/dhcp-all-interfaces/pkg-map b/elements/dhcp-all-interfaces/pkg-map
index 4ffc46522..25d2ec6a7 100644
--- a/elements/dhcp-all-interfaces/pkg-map
+++ b/elements/dhcp-all-interfaces/pkg-map
@@ -1,14 +1,13 @@
{
"family": {
"redhat": {
- "isc-dhcp-client": "dhclient"
+ "dhcp-client": "dhclient"
},
"gentoo": {
- "dhcpcd": "net-misc/dhcpcd"
+ "dhcp-client": "net-misc/dhcpcd"
}
},
"default": {
- "isc-dhcp-client": "isc-dhcp-client",
- "dhcpcd": ""
+ "dhcp-client": "isc-dhcp-client"
}
}
diff --git a/elements/simple-init/package-installs.yaml b/elements/simple-init/package-installs.yaml
index 780572e53..8690364b5 100644
--- a/elements/simple-init/package-installs.yaml
+++ b/elements/simple-init/package-installs.yaml
@@ -1,3 +1,3 @@
-isc-dhcp-client:
+dhcp-client:
net-tools:
ifupdown:
diff --git a/elements/simple-init/pkg-map b/elements/simple-init/pkg-map
index ee3e372a5..a26ad1bc1 100644
--- a/elements/simple-init/pkg-map
+++ b/elements/simple-init/pkg-map
@@ -1,20 +1,20 @@
{
"family": {
"redhat": {
- "isc-dhcp-client": "dhclient"
+ "dhcp-client": "dhclient"
},
"debian": {
- "isc-dhcp-client": "isc-dhcp-client",
+ "dhcp-client": "isc-dhcp-client",
"ifupdown": "ifupdown"
},
"gentoo": {
- "isc-dhcp-client": "net-misc/dhcp",
+ "dhcp-client": "net-misc/dhcp",
"python-pip": "dev-python/pip",
"net-tools": "sys-apps/net-tools"
}
},
"default": {
- "isc-dhcp-client": "isc-dhcp-client",
+ "dhcp-client": "isc-dhcp-client",
"ifupdown": ""
}
}