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

Merge remote-tracking branch 'osallou/update_image_commands_to_base' into python

Browse source 
Conflicts:
	plugins/image_commands/__init__.py
	plugins/image_commands/image_commands.py
This commit is contained in:
Anders Ingemann 2013-12-15 11:43:42 +01:00
commit 4cca325fb4
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/image_commands/README.md
View file

@ -14,11 +14,9 @@ Command is executed in current context. It is possible to use variables to acces
Available variables are: Available variables are:
{root} : image mount point (to copy files for example or chroot commands) {root} : image mount point (to copy files for example or chroot commands)
{filesystem} : used filesystem
{image} : image file path
Example: Example:
[[ "touch", "{root}/var/www/hello" ], [[ "touch", "{root}/var/www/hello" ],
[ "/usr/sbin/chroot", "{root}", "touch", "/var/www/hello.{filesystem}"]] [ "/usr/sbin/chroot", "{root}", "touch", "/var/www/hello"]]

6
plugins/image_commands/image_commands.py
View file

@ -1,10 +1,12 @@
from base import Task from base import Task
from common import phases from common import phases
from plugins.packages import tasks as packages
class ImageExecuteCommand(Task): class ImageExecuteCommand(Task):
description = 'Execute command in the image' description = 'Execute command in the image'
phase = phases.system_modification phase = phases.system_modification
predecessors = [packages.AddUserPackages, packages.AddLocalUserPackages]
def run(self, info): def run(self, info):
from common.tools import log_check_call from common.tools import log_check_call
@ -12,8 +14,6 @@ class ImageExecuteCommand(Task):
for user_cmd in info.manifest.plugins['image_commands']['commands']: for user_cmd in info.manifest.plugins['image_commands']['commands']:
command = [] command = []
for elt in user_cmd: for elt in user_cmd:
fragment = elt.format(root=info.root, fragment = elt.format(root=info.root)
image=info.loopback_file,
filesystem=info.manifest.volume['filesystem'])
command.append(fragment) command.append(fragment)
log_check_call(command) log_check_call(command)