156 commits

Author	SHA1	Message	Date
James Bromberger	b034ca8ed1	Correct merge/rebase. Fix handling of console to hvc0. Try and pre-seed cloud-init.	2014-04-08 10:09:02 +00:00
James Bromberger	334ef9209b	Merge remote-tracking branch 'upstream/master' ... Conflicts: bootstrapvz/common/tasks/apt.py	2014-04-05 09:38:21 +00:00
Jan Brauer	8d399dade5	Add support for adding APT preferences	2014-04-04 12:22:46 +02:00
Anders Ingemann	33a430566b	bootstrap-vz is now a proper python package ... logs/ was remove. logs are now placed in /var/logs/bootstrap-vz instead	2014-04-02 23:25:50 +02:00
Anders Ingemann	bbb06d717e	Properly fix imports and make bootstrapvz work like a package	2014-04-02 21:32:10 +02:00
Anders Ingemann	be96e4c13f	Move code into proper package folder	2014-04-02 21:26:13 +02:00