From 20b865f1ab3266baaae42fb8b99be0b610c65cf4 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 29 May 2025 17:23:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E8=AE=BE=E7=BD=AE=E4=BB=A5=E9=98=B2=E6=AD=A2?= =?UTF-8?q?=E8=BF=9B=E7=A8=8B=E9=98=BB=E5=A1=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/framework/cmd/cmd_session.go | 6 +----- src/modules/network_element/service/ne_version.go | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/framework/cmd/cmd_session.go b/src/framework/cmd/cmd_session.go index 25fa65d9..dfeb146c 100644 --- a/src/framework/cmd/cmd_session.go +++ b/src/framework/cmd/cmd_session.go @@ -4,7 +4,6 @@ import ( "fmt" "os" "os/exec" - "syscall" "github.com/creack/pty" ) @@ -13,10 +12,7 @@ import ( func NewClientSession(cols, rows int) (*LocalClientSession, error) { // Create arbitrary command. c := exec.Command("bash") - // 为防止当前进程阻塞,设置为后台执行 - c.SysProcAttr = &syscall.SysProcAttr{ - Setpgid: true, // 设置新进程组,确保安装进程与当前进程不在同一进程组 - } + // Start the command with a pty. ptmx, err := pty.StartWithSize(c, &pty.Winsize{ Rows: uint16(rows), // ws_row: Number of rows (in cells). diff --git a/src/modules/network_element/service/ne_version.go b/src/modules/network_element/service/ne_version.go index aea61466..414df5c6 100644 --- a/src/modules/network_element/service/ne_version.go +++ b/src/modules/network_element/service/ne_version.go @@ -270,7 +270,7 @@ func (r NeVersion) operateCommand(action, neType string, neFilePaths []string) ( // 2s后执行omc相关命令 cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo rm -f /tmp/operate_run_%s_omc.out \n", action)) - cmdStrArr = append(cmdStrArr, fmt.Sprintf("nohup sh -c \"sleep 2s && %s\" > /tmp/operate_run_%s_omc.out2>&1 & \n", strings.Join(omcStrArr, " && "), action)) + cmdStrArr = append(cmdStrArr, fmt.Sprintf("nohup sh -c \"sleep 2s && %s\" > /tmp/operate_run_%s_omc.out >&1 & \n", strings.Join(omcStrArr, " && "), action)) cmdStrArr = append(cmdStrArr, fmt.Sprintf("echo '%s' \n", okFlagStr)) return okFlagStr, cmdStrArr, nil } else if neType == "IMS" {