Merge pull request #1547 from teawater/vmtemplate_init_check

factory: Check if vm templateing is on before vm templateing initialize
This commit is contained in:
Fupan Li 2019-04-19 10:19:14 +08:00 committed by GitHub
commit 3bdc40bfd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -46,7 +46,12 @@ func New(ctx context.Context, config vc.VMConfig) (base.FactoryBase, error) {
statePath := store.RunVMStoragePath + "/template" statePath := store.RunVMStoragePath + "/template"
t := &template{statePath, config} t := &template{statePath, config}
err := t.prepareTemplateFiles() err := t.checkTemplateVM()
if err == nil {
return nil, fmt.Errorf("There is already a VM template in %s", statePath)
}
err = t.prepareTemplateFiles()
if err != nil { if err != nil {
return nil, err return nil, err
} }