kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-24 07:26:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

set mirror in bootstrapper instead of image

Browse source
This commit is contained in:
Olivier Sallou 2013-08-13 09:52:03 +02:00
parent df9ac2c0fb
commit afa9352d85
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
base/manifest-schema.json
View file

@ -13,7 +13,8 @@
"image_file": { "type": "string" }, "image_file": { "type": "string" },
"tarball": { "type": "boolean" }, "tarball": { "type": "boolean" },
"tarball_dir": { "type": "string" }, "tarball_dir": { "type": "string" },
"device" : { "type" : "string" } "device" : { "type" : "string" },
"mirror": { "type": "string" }
}, },
"required": ["mount_dir"] "required": ["mount_dir"]
}, },
@ -30,8 +31,7 @@
}, },
"timezone": { "type": "string" }, "timezone": { "type": "string" },
"locale": { "type": "string" }, "locale": { "type": "string" },
"charmap": { "type": "string" }, "charmap": { "type": "string" }
"mirror": { "type": "string" }
}, },
"required": ["release", "architecture", "timezone", "locale", "charmap"] "required": ["release", "architecture", "timezone", "locale", "charmap"]
}, },

4
common/tasks/bootstrap.py
View file

@ -13,8 +13,8 @@ def get_bootstrap_args(info):
options.append('--include=' + ','.join(include)) options.append('--include=' + ','.join(include))
if len(exclude) > 0: if len(exclude) > 0:
options.append('--exclude=' + ','.join(exclude)) options.append('--exclude=' + ','.join(exclude))
if info.manifest.system['mirror']: if info.manifest.bootstrapper['mirror']:
mirror = info.manifest.system['mirror'] mirror = info.manifest.bootstrapper['mirror']
else: else:
mirror = 'http://http.debian.net/debian' mirror = 'http://http.debian.net/debian'
arguments = [info.manifest.system['release'], info.root, mirror] arguments = [info.manifest.system['release'], info.root, mirror]

12
manifests/virtualbox.json
View file

@ -3,7 +3,8 @@
"virtualization": "ide", "virtualization": "ide",
"bootstrapper": { "bootstrapper": {
"mount_dir": "/mnt/target" "mount_dir": "/mnt/target",
"mirror" : "http://ftp.fr.debian.org/debian/"
}, },
"image": { "image": {
"name" : "debian-{release}-{architecture}-{virtualization}-{%y}{%m}{%d}", "name" : "debian-{release}-{architecture}-{virtualization}-{%y}{%m}{%d}",
@ -14,8 +15,7 @@
"architecture": "amd64", "architecture": "amd64",
"timezone" : "UTC", "timezone" : "UTC",
"locale" : "en_US", "locale" : "en_US",
"charmap" : "UTF-8", "charmap" : "UTF-8"
"mirror" : "http://ftp.fr.debian.org/debian/"
}, },
"volume": { "volume": {
"backing" : "raw", "backing" : "raw",
@ -32,6 +32,10 @@
"root_password": { "root_password": {
"enabled": true, "enabled": true,
"password": "test" "password": "test"
} },
"convert_image": {
"enabled": true,
"format": "vdi"
}
} }
} }