Fix required packages

This commit is contained in:
Anders Ingemann 2013-09-20 16:08:53 +00:00
parent d6502089e2
commit c744196d2f

View file

@ -11,7 +11,7 @@ class HostPackages(Task):
after = [packages.HostPackages]
def run(self, info):
info.host_packages.update(['qemu-utils', 'parted', 'grub2', 'sysv-rc', 'kpartx'])
info.host_packages.update(['qemu-utils', 'parted', 'kpartx', 'sysv-rc'])
if 'xfs' in (p.filesystem for p in info.volume.partition_map.partitions):
info.host_packages.add('xfsprogs')
@ -25,20 +25,7 @@ class ImagePackages(Task):
manifest = info.manifest
include, exclude = info.img_packages
# Add some basic packages we are going to need
include.update(['parted',
'kpartx',
# Needed for the init scripts
'file',
# isc-dhcp-client doesn't work properly with ec2
'dhcpcd',
'chkconfig',
'openssh-client',
'grub2'
])
exclude.update(['isc-dhcp-client',
'isc-dhcp-common',
])
include.update(['grub2'])
# In squeeze, we need a special kernel flavor for xen
kernels = {'squeeze': {'amd64': 'linux-image-amd64',