kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-24 15:36:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename tasklist to taskset in vbox provider

Browse source
This commit is contained in:
Anders Ingemann 2014-01-20 21:01:42 +01:00
parent c67b68fc5a
commit 030f100eac
1 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
providers/virtualbox/__init__.py
View file

@ -24,52 +24,52 @@ def validate_manifest(data, validator, error):
error('Only extlinux can boot from unpartitioned disks', ['system', 'bootloader']) error('Only extlinux can boot from unpartitioned disks', ['system', 'bootloader'])
def resolve_tasks(tasklist, manifest): def resolve_tasks(taskset, manifest):
import common.task_sets import common.task_sets
tasklist.update(common.task_sets.base_set) taskset.update(common.task_sets.base_set)
tasklist.update(common.task_sets.volume_set) taskset.update(common.task_sets.volume_set)
tasklist.update(common.task_sets.mounting_set) taskset.update(common.task_sets.mounting_set)
tasklist.update(common.task_sets.get_apt_set(manifest)) taskset.update(common.task_sets.get_apt_set(manifest))
tasklist.update(common.task_sets.locale_set) taskset.update(common.task_sets.locale_set)
tasklist.update(common.task_sets.bootloader_set.get(manifest.system['bootloader'])) taskset.update(common.task_sets.bootloader_set.get(manifest.system['bootloader']))
if manifest.volume['partitions']['type'] != 'none': if manifest.volume['partitions']['type'] != 'none':
tasklist.update(common.task_sets.partitioning_set) taskset.update(common.task_sets.partitioning_set)
tasklist.update([tasks.packages.DefaultPackages, taskset.update([tasks.packages.DefaultPackages,
loopback.Create, loopback.Create,
security.EnableShadowConfig, security.EnableShadowConfig,
network.RemoveDNSInfo, network.RemoveDNSInfo,
network.ConfigureNetworkIF, network.ConfigureNetworkIF,
network.RemoveHostname, network.RemoveHostname,
initd.AddSSHKeyGeneration, initd.AddSSHKeyGeneration,
initd.InstallInitScripts, initd.InstallInitScripts,
cleanup.ClearMOTD, cleanup.ClearMOTD,
cleanup.CleanTMP, cleanup.CleanTMP,
loopback.MoveImage, loopback.MoveImage,
]) ])
if manifest.bootstrapper.get('guest_additions', False): if manifest.bootstrapper.get('guest_additions', False):
from tasks import guest_additions from tasks import guest_additions
tasklist.update([guest_additions.CheckGuestAdditionsPath, taskset.update([guest_additions.CheckGuestAdditionsPath,
guest_additions.AddGuestAdditionsPackages, guest_additions.AddGuestAdditionsPackages,
guest_additions.InstallGuestAdditions, guest_additions.InstallGuestAdditions,
]) ])
if manifest.bootstrapper.get('tarball', False): if manifest.bootstrapper.get('tarball', False):
tasklist.add(bootstrap.MakeTarball) taskset.add(bootstrap.MakeTarball)
tasklist.update(common.task_sets.get_fs_specific_set(manifest.volume['partitions'])) taskset.update(common.task_sets.get_fs_specific_set(manifest.volume['partitions']))
if 'boot' in manifest.volume['partitions']: if 'boot' in manifest.volume['partitions']:
tasklist.update(common.task_sets.boot_partition_set) taskset.update(common.task_sets.boot_partition_set)
def resolve_rollback_tasks(tasklist, manifest, counter_task): def resolve_rollback_tasks(taskset, manifest, counter_task):
counter_task(loopback.Create, volume.Delete) counter_task(loopback.Create, volume.Delete)
counter_task(filesystem.CreateMountDir, filesystem.DeleteMountDir) counter_task(filesystem.CreateMountDir, filesystem.DeleteMountDir)
counter_task(partitioning.MapPartitions, partitioning.UnmapPartitions) counter_task(partitioning.MapPartitions, partitioning.UnmapPartitions)