Correct mirror entry, turn on admin user; fix chroot call to create admin user (--shell and /bin/bash as two entries, not one argument).

This commit is contained in:
James Bromberger 2013-08-15 22:17:37 +00:00
parent ca3c454889
commit 90fbe9d698
3 changed files with 10 additions and 4 deletions

View file

@ -28,7 +28,8 @@
},
"plugins": {
"admin_user": {
"enabled": false
"enabled": true,
"username": "admin"
},
"build_metadata": {
"enabled": false,

View file

@ -10,10 +10,11 @@
},
"bootstrapper": {
"mount_dir": "/target"
"mount_dir": "/target",
"mirror": "http://http.debian.net/debian"
},
"image": {
"name": "debian-{release}-{architecture}-{virtualization}-{%y}{%m}{%d}",
"name": "debian-{release}-{architecture}-{virtualization}-{%Y}{%m}{%d}",
"description": "Debian {release} {architecture} AMI ({virtualization})"
"bucket": ""
},
@ -30,6 +31,10 @@
"size": 1024
},
"plugins": {
"admin_user": {
"enabled": true,
"username": "admin"
},
"prebootstrapped": {
"enabled": false,
"image": null

View file

@ -24,7 +24,7 @@ class CreateAdminUser(Task):
from common.tools import log_check_call
log_check_call(['/usr/sbin/chroot', info.root,
'/usr/sbin/useradd',
'--create-home', '--shell /bin/bash',
'--create-home', '--shell', '/bin/bash',
info.manifest.plugins['admin_user']['username']])