Merge pull request #650 from xkwangcn/master

Create coreos ignition guestfs upload directory for s390 platform

Author: MalloZup

libvirt/domain.go

@@ -351,6 +351,13 @@ func guestfishExecution(rootPath string, fileToUpload string) error {
 		return fmt.Errorf("Mount failed: %v, %s", err, getStderr(stderr))
 	}
 
+	// guestfish --remote -- mkdir-p /ignition
+	cmd = execCommand("guestfish", "--remote", "--", "mkdir-p", "/ignition")
+	err = cmd.Run()
+	if err != nil {
+		return fmt.Errorf("Mkdir failed: %v, %s", err, getStderr(stderr))
+	}
+
 	// This is the real command that upload the file from current location (the local file system)
 	// to remote file location (the coreos file system)
 	// guestfish --remote -- upload $4 $3/$4

libvirt/guestfish_test.go

@@ -39,6 +39,9 @@ var supportedCommands = [][]string{
 	{
 		"guestfish", "--remote", "--", "mount", "*", "/",
 	},
+	{
+		"guestfish", "--remote", "--", "mkdir-p", "/ignition",
+	},
 	{
 		"guestfish", "--remote", "--", "upload", "*.ign", "/ignition/config.ign",
 	},
@@ -68,6 +71,9 @@ var supportedCommandTree = map[string]interface{}{
 						"/": nil,
 					},
 				},
+				"mkdir-p": map[string]interface{}{
+					"/ignition": nil,
+				},
 				"upload": map[string]interface{}{
 					".*.ign": map[string]interface{}{
 						"/ignition/config.ign": nil,
@@ -189,6 +195,13 @@ func validateCommandSemanticsAndGenerateOutput(args ...string) (bool, string) {
 		return false, errMsg
 	}
 
+	if newArgs[3] == "mkdir-p" {
+		if Mounted == currentGuestfishStatus {
+			return true, ""
+		}
+		return false, errMsg
+	}
+
 	if newArgs[3] == "upload" {
 		if Mounted == currentGuestfishStatus {
 			return true, ""