mirror of
https://github.com/kevingruesser/bootstrap-vz.git
synced 2025-08-24 07:26:29 +00:00
Allow mixed kernel/userspace architecture.
This is to allow building an image for a 64bit machine but with 32bit userspace. Probably not a common usecase but ideal if you need to address more higher quantities of memory but cant migrate to a full 64bit userspace due to something like ruby eating twice as much memory.
This commit is contained in:
parent
880e13f0d8
commit
57909eb9bc
2 changed files with 4 additions and 1 deletions
|
@ -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
|
||||||
|
|
|
@ -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:
|
||||||
|
|
Loading…
Add table
Reference in a new issue