diff --git a/plugins/image_commands/README.md b/plugins/image_commands/README.md index 8dc0e50..61583d5 100644 --- a/plugins/image_commands/README.md +++ b/plugins/image_commands/README.md @@ -14,11 +14,9 @@ Command is executed in current context. It is possible to use variables to acces Available variables are: {root} : image mount point (to copy files for example or chroot commands) - {filesystem} : used filesystem - {image} : image file path Example: [[ "touch", "{root}/var/www/hello" ], - [ "/usr/sbin/chroot", "{root}", "touch", "/var/www/hello.{filesystem}"]] + [ "/usr/sbin/chroot", "{root}", "touch", "/var/www/hello"]] diff --git a/plugins/image_commands/image_commands.py b/plugins/image_commands/image_commands.py index 71781aa..619186c 100644 --- a/plugins/image_commands/image_commands.py +++ b/plugins/image_commands/image_commands.py @@ -1,10 +1,12 @@ from base import Task from common import phases +from plugins.packages import tasks as packages class ImageExecuteCommand(Task): description = 'Execute command in the image' phase = phases.system_modification + predecessors = [packages.AddUserPackages, packages.AddLocalUserPackages] def run(self, info): from common.tools import log_check_call @@ -12,8 +14,6 @@ class ImageExecuteCommand(Task): for user_cmd in info.manifest.plugins['image_commands']['commands']: command = [] for elt in user_cmd: - fragment = elt.format(root=info.root, - image=info.loopback_file, - filesystem=info.manifest.volume['filesystem']) + fragment = elt.format(root=info.root) command.append(fragment) log_check_call(command)