mirror of
https://github.com/kevingruesser/bootstrap-vz.git
synced 2025-08-24 15:36:27 +00:00
Merge pull request #228 from jwendell/get-rid-of-dhcpcd
EC2: Only install dhcpcd on releases before jessie
This commit is contained in:
commit
e0553ee80d
1 changed files with 6 additions and 8 deletions
|
@ -9,13 +9,11 @@ class DefaultPackages(Task):
|
||||||
@classmethod
|
@classmethod
|
||||||
def run(cls, info):
|
def run(cls, info):
|
||||||
info.packages.add('file') # Needed for the init scripts
|
info.packages.add('file') # Needed for the init scripts
|
||||||
# isc-dhcp-client doesn't work properly with ec2
|
|
||||||
from bootstrapvz.common.releases import jessie
|
|
||||||
if info.manifest.release >= jessie:
|
|
||||||
info.packages.add('dhcpcd5')
|
|
||||||
else:
|
|
||||||
info.packages.add('dhcpcd')
|
|
||||||
|
|
||||||
|
# isc-dhcp-client before jessie doesn't work properly with ec2
|
||||||
|
from bootstrapvz.common.releases import jessie
|
||||||
|
if info.manifest.release < jessie:
|
||||||
|
info.packages.add('dhcpcd')
|
||||||
info.exclude_packages.add('isc-dhcp-client')
|
info.exclude_packages.add('isc-dhcp-client')
|
||||||
info.exclude_packages.add('isc-dhcp-common')
|
info.exclude_packages.add('isc-dhcp-common')
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue