Merge pull request #2141 from Ace-Tang/runtime_args

bugfix: fix runtime script may be coverd

Author: CodeJuan

daemon/mgr/container_utils.go

@@ -116,16 +116,17 @@ func (mgr *ContainerManager) getRuntime(runtime string) (string, error) {
 
 	// it is ok to use runtime name as a path.
 	rPath := runtime
-	if len(r.RuntimeArgs) > 0 {
-		rPath = filepath.Join(mgr.Config.HomeDir, RuntimeDir, runtime)
-	}
-
 	// generally speaking, path is not be empty, but we not forbid empty path
 	// in config set, since name can be a path too.
 	if r.Path != "" {
 		rPath = r.Path
 	}
 
+	// if Runtime has args, use script path as runtime path.
+	if len(r.RuntimeArgs) > 0 {
+		rPath = filepath.Join(mgr.Config.HomeDir, RuntimeDir, runtime)
+	}
+
 	return rPath, nil
 }