Rename task variables to fit common scheme

ec2debian-build-ami

@@ -134,14 +134,14 @@ TASK_CREATE_VOLUME="10-create-volume"
 TASK_MOUNT_VOLUME="13-mount-volume"
 TASK_BOOTSTRAP="14-bootstrap"
 TASK_MOUNT_SPECIALS="15-mount-specials"
-TASK_APTSOURCES="21-apt-sources"
+TASK_APT_SOURCES="21-apt-sources"
 TASK_APT_UPGRADE="22-apt-upgrade"
 TASK_INITSCRIPTS="51-init-scripts"
 TASK_UNMOUNT_SPECIALS="71-unmount-specials"
 TASK_UNMOUNT_VOLUME="72-unmount-volume"
 TASK_SNAPSHOT="80-ebs-snapshot"
 TASK_DELETE_VOLUME="82-delete-volume"
-TASK_CREATEAMI="95-register-ami"
+TASK_CREATE_AMI="95-register-ami"
 
 # Invoke plugins so that they may reorder and add tasks
 for plugin in "${plugins[@]}"; do

plugins/HOWTO.md

@@ -32,14 +32,18 @@ remove_task "40-networking"
 The internal workings of the bootstrapper might change from time to time, this includes the filenames of the different tasks. There are however some fundamentals in the bootstrapping process that are not likely to ever change. You can hook your plugin up to those fundamentals, they are aliased in the form of variables that point to a task filename.
 
 * `TASK_PACKAGES`: Adds packages to the `packages` array (and `exclude_packages`)
-* `TASK_VOLUME`: Creates the EBS volume
+* `TASK_CREATE_VOLUME`: Creates the EBS volume
+* `TASK_MOUNT_VOLUME`: Mounts the EBS volume
 * `TASK_BOOTSTRAP`: Runs the bootstrapping process
-* `TASK_MOUNT`: Mounts things like /dev/pts and /proc
-* `TASK_APTSOURCES`: Sets the aptitude sources
+* `TASK_MOUNT_SPECIALS`: Mounts things like /dev/pts and /proc
+* `TASK_APT_SOURCES`: Sets the aptitude sources
+* `TASK_APT_UPGRADE`: Upgrades packages and fixes broken dependencies
 * `TASK_INITSCRIPTS`: Installs the init.d scripts
-* `TASK_UNMOUNT`: Unmounts the EBS volume
+* `TASK_UNMOUNT_SPECIALS`: Unmounts things like /dev/pts and /proc
+* `TASK_UNMOUNT_VOLUME`: Unmounts the EBS volume
 * `TASK_SNAPSHOT`: Creates a snapshot of the EBS volume
-* `TASK_CREATEAMI`: Registers the snapshot as an AMI
+* `TASK_DELETE_VOLUME`: Deletes the EBS volume
+* `TASK_CREATE_AMI`: Registers the snapshot as an AMI
 
 ### Internal variables ###
 

plugins/unattended-upgrades

@@ -1,5 +1,5 @@
 #!/bin/bash
 insert_task_after $TASK_PACKAGES \
 	$plugindir/unattended-upgrades-tasks/add-unattended-upgrades-package
-insert_task_before $TASK_APTSOURCES \
+insert_task_before $TASK_APT_SOURCES \
 	$plugindir/unattended-upgrades-tasks/create-02periodic