kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-10-11 01:29:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #156 from jbergler/development

Browse source 
Allow mixed kernel/userspace architecture.
This commit is contained in:
Anders Ingemann 2014-11-22 02:26:27 +06:00
commit 2e1c419ea0
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bootstrapvz/base/manifest-schema.yml
View file

@ -40,6 +40,8 @@ properties:
properties: properties:
architecture: architecture:
enum: [i386, amd64] enum: [i386, amd64]
userspace_architecture:
enum: [i386]
bootloader: bootloader:
enum: enum:
- pvgrub - pvgrub

3
bootstrapvz/common/tasks/bootstrap.py
View file

@ -19,7 +19,8 @@ class AddRequiredCommands(Task):
def get_bootstrap_args(info): def get_bootstrap_args(info):
executable = ['debootstrap'] executable = ['debootstrap']
options = ['--arch=' + info.manifest.system['architecture']] arch = info.manifest.system.get('userspace_architecture', info.manifest.system.get('architecture'))
options = ['--arch=' + arch]
if len(info.include_packages) > 0: if len(info.include_packages) > 0:
options.append('--include=' + ','.join(info.include_packages)) options.append('--include=' + ','.join(info.include_packages))
if len(info.exclude_packages) > 0: if len(info.exclude_packages) > 0: