X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=cmd-target.go;h=6140755edd9d6aa0cfe5be607b91803bc71bc14f;hb=5e7b2dec616b844dd881897727d0edceb90dfa85;hp=cd96ed4ff50d864cb828cca1d4baf00a7fc3c666;hpb=00b5b83dcff4904aeb18760caa193fa3393241e0;p=src%2Fxds%2Fxds-cli.git

diff --git a/cmd-target.go b/cmd-target.go
index cd96ed4..6140755 100644
--- a/cmd-target.go
+++ b/cmd-target.go
@@ -165,7 +165,7 @@ func targetsList(ctx *cli.Context) error {
 }
 
 func targetsGet(ctx *cli.Context) error {
-	id := GetID(ctx)
+	id := GetID(ctx, "XDS_TARGET_ID")
 	if id == "" {
 		return cli.NewExitError("id parameter or option must be set", 1)
 	}
@@ -254,7 +254,7 @@ func targetsAdd(ctx *cli.Context) error {
 
 func targetsRemove(ctx *cli.Context) error {
 	var res xaapiv1.TargetConfig
-	id := GetID(ctx)
+	id := GetID(ctx, "XDS_TARGET_ID")
 	if id == "" {
 		return cli.NewExitError("id parameter or option must be set", 1)
 	}
@@ -437,6 +437,10 @@ func terminalOpen(ctx *cli.Context) error {
 
 	// Wait exit - blocking
 	select {
+	case res := <-IOSkClient.ServerDiscoChan:
+		Log.Debugf("XDS Server disconnected %v", res)
+		return cli.NewExitError(res.error, res.code)
+
 	case res := <-exitChan:
 		errStr := ""
 		if res.code == 0 {
@@ -539,7 +543,7 @@ func GetTargetAndTerminalIDs(ctx *cli.Context, useFirstFree bool) (*xaapiv1.Targ
 	}
 
 	// Allow to create a new terminal when only target id is set
-	idArg = GetIDName(ctx, "id")
+	idArg = GetIDName(ctx, "id", "XDS_TARGET_ID")
 	if idArg == "" {
 		return nil, nil, fmt.Errorf("id or termId argument must be set")
 	}