make mirror mandatory in manifest

This commit is contained in:
Olivier Sallou 2013-08-13 10:43:29 +02:00
parent 3dd3e00e5c
commit 398a4da313
2 changed files with 2 additions and 5 deletions

View file

@ -16,7 +16,7 @@
"device" : { "type" : "string" }, "device" : { "type" : "string" },
"mirror": { "type": "string" } "mirror": { "type": "string" }
}, },
"required": ["mount_dir"] "required": ["mount_dir", "mirror"]
}, },
"system": { "system": {
"type": "object", "type": "object",

View file

@ -13,10 +13,7 @@ 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.bootstrapper['mirror']: mirror = info.manifest.bootstrapper['mirror']
mirror = info.manifest.bootstrapper['mirror']
else:
mirror = 'http://http.debian.net/debian'
arguments = [info.manifest.system['release'], info.root, mirror] arguments = [info.manifest.system['release'], info.root, mirror]
return executable, options, arguments return executable, options, arguments