Merge pull request #975 from subutai-io/issue-963

#963
subutai-io · Mar 8, 2019 · 2c3e43b · 2c3e43b
2 parents 20c9719 + 4bc8909
commit 2c3e43b
Show file tree

Hide file tree

Showing 12 changed files with 348 additions and 1,065 deletions.
diff --git a/cli/backup.go b/cli/backup.go
diff --git a/cli/clone.go b/cli/clone.go
@@ -16,7 +16,6 @@ import (
 	"github.com/nightlyone/lockfile"
 	"time"
 	"github.com/subutai-io/agent/lib/common"
-	"github.com/subutai-io/agent/lib/fs"
 )
 
 var (
@@ -34,17 +33,14 @@ var (
 // This is one of the security checks which makes sure that each container creation request is authorized by registered user.
 //
 // The clone options are not intended for manual use: unless you're confident about what you're doing. Use default clone format without additional options to create Subutai containers.
-func LxcClone(parent, child, envID, addr, consoleSecret, backupFile string) {
+func LxcClone(parent, child, envID, addr, consoleSecret string) {
 
 	util.VerifyLxcName(child)
 
 	if container.LxcInstanceExists(child) {
 		log.Error("Container " + child + " already exists")
 	}
 
-	backupFile = strings.TrimSpace(backupFile)
-	checkState(backupFile == "" || fs.FileExists(backupFile), "Backup file %s not found", backupFile)
-
 	//synchronize
 	var lock lockfile.Lockfile
 	var err error
@@ -73,7 +69,7 @@ func LxcClone(parent, child, envID, addr, consoleSecret, backupFile string) {
 		LxcImport("id:"+t.Id, "")
 	}
 
-	log.Check(log.ErrorLevel, "Cloning the container", container.Clone(fullRef, child, backupFile))
+	log.Check(log.ErrorLevel, "Cloning the container", container.Clone(fullRef, child))
 
 	gpg.GenerateKey(child)
 	if len(consoleSecret) != 0 {

diff --git a/cli/import.go b/cli/import.go
@@ -555,19 +555,19 @@ func install(templateName string) error {
 		return err
 	}
 	// create partitions
-	err = fs.ReceiveStream(templateName+"/rootfs", path.Join(pathToDecompressedTemplate, "deltas", "rootfs.delta"))
+	err = fs.ReceiveStream(templateName+"/rootfs", path.Join(pathToDecompressedTemplate, "deltas", "rootfs.delta"), false)
 	if err != nil {
 		return err
 	}
-	err = fs.ReceiveStream(templateName+"/home", path.Join(pathToDecompressedTemplate, "deltas", "home.delta"))
+	err = fs.ReceiveStream(templateName+"/home", path.Join(pathToDecompressedTemplate, "deltas", "home.delta"), false)
 	if err != nil {
 		return err
 	}
-	err = fs.ReceiveStream(templateName+"/var", path.Join(pathToDecompressedTemplate, "deltas", "var.delta"))
+	err = fs.ReceiveStream(templateName+"/var", path.Join(pathToDecompressedTemplate, "deltas", "var.delta"), false)
 	if err != nil {
 		return err
 	}
-	err = fs.ReceiveStream(templateName+"/opt", path.Join(pathToDecompressedTemplate, "deltas", "opt.delta"))
+	err = fs.ReceiveStream(templateName+"/opt", path.Join(pathToDecompressedTemplate, "deltas", "opt.delta"), false)
 	if err != nil {
 		return err
 	}
@@ -599,7 +599,7 @@ func install(templateName string) error {
 }
 
 func initManagement(templateRef string) {
-	container.Clone(templateRef, container.Management, "")
+	container.Clone(templateRef, container.Management)
 
 	container.SetContainerUID(container.Management)
 	container.SetContainerConf(container.Management, [][]string{