[gentoo-commits] proj/releng:master commit in: releases/weekly/specs/amd64/, releases/weekly/specs/amd64/hardened/

[Matt Thode]

commit:     10f830e663b628ab3342bbc1a006d62343cb44bb
Author:     Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Tue Jan 26 05:40:57 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Jan 26 05:40:57 2016 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=10f830e6

switch to isc dhcp

 releases/weekly/specs/amd64/hardened/stage4-minimal.spec            | 3 +--
 releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec | 3 +--
 releases/weekly/specs/amd64/stage4-minimal.spec                     | 3 +--
 releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec          | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/releases/weekly/specs/amd64/hardened/stage4-minimal.spec 
b/releases/weekly/specs/amd64/hardened/stage4-minimal.spec
index 3a3819e..594df10 100644
--- a/releases/weekly/specs/amd64/hardened/stage4-minimal.spec
+++ b/releases/weekly/specs/amd64/hardened/stage4-minimal.spec
@@ -19,7 +19,7 @@ stage4/use:
 
 stage4/packages:
        app-admin/sudo
-       net-misc/dhcpcd
+       net-misc/dhcp
        sys-boot/grub
        sys-apps/dmidecode
        sys-apps/gptfdisk
@@ -31,7 +31,6 @@ stage4/fsscript: 
/release/releng/releases/weekly/scripts/cloud-prep.sh
 stage4/root_overlay: /release/releng/releases/weekly/overlays/cloud-overlay
 stage4/rcadd:
        acpid|default
-       dhcpcd|default
        net.lo|default
        netmount|default
        sshd|default

diff --git 
a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec 
b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec
index 7de5f56..ca441e7 100644
--- a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec
+++ b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec
@@ -19,7 +19,7 @@ stage4/use:
 
 stage4/packages:
        app-admin/sudo
-       net-misc/dhcpcd
+       net-misc/dhcp
   net-misc/iputils
        sys-boot/grub
        sys-apps/gptfdisk
@@ -31,7 +31,6 @@ stage4/fsscript: 
/release/releng/releases/weekly/scripts/cloud-prep.sh
 stage4/root_overlay: /release/releng/releases/weekly/overlays/cloud-overlay
 stage4/rcadd:
        acpid|default
-       dhcpcd|default
        net.lo|default
        netmount|default
        sshd|default

diff --git a/releases/weekly/specs/amd64/stage4-minimal.spec 
b/releases/weekly/specs/amd64/stage4-minimal.spec
index bce2c81..a550659 100644
--- a/releases/weekly/specs/amd64/stage4-minimal.spec
+++ b/releases/weekly/specs/amd64/stage4-minimal.spec
@@ -19,7 +19,7 @@ stage4/use:
 
 stage4/packages:
        app-admin/sudo
-       net-misc/dhcpcd
+       net-misc/dhcp
        net-misc/iputils
        sys-boot/grub
        sys-apps/gptfdisk
@@ -31,7 +31,6 @@ stage4/fsscript: 
/release/releng/releases/weekly/scripts/cloud-prep.sh
 stage4/root_overlay: /release/releng/releases/weekly/overlays/cloud-overlay
 stage4/rcadd:
        acpid|default
-       dhcpcd|default
        net.lo|default
        netmount|default
        sshd|default

diff --git a/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec 
b/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec
index da3837e..1cd5e28 100644
--- a/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec
+++ b/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec
@@ -19,7 +19,7 @@ stage4/use:
 
 stage4/packages:
        app-admin/sudo
-       net-misc/dhcpcd
+       net-misc/dhcp
        net-misc/iputils
        sys-boot/grub
        sys-apps/gptfdisk
@@ -31,7 +31,6 @@ stage4/fsscript: 
/release/releng/releases/weekly/scripts/cloud-prep.sh
 stage4/root_overlay: /release/releng/releases/weekly/overlays/cloud-overlay
 stage4/rcadd:
        acpid|default
-       dhcpcd|default
        net.lo|default
        netmount|default
        sshd|default