提交: bf32d1ba9d65afca6a16da650cae3227fd632197 - vmtui (git)

Virtual machine Management Terminal User Interface

Commit MetaInfo

• 修订版: bf32d1ba9d65afca6a16da650cae3227fd632197 (tree)
• 时间: 2023-04-01 22:23:34
• 作者: Koine Yuusuke(koinec) <koinec@user...>
• Commiter: Koine Yuusuke(koinec)

Log Message

WorkBackup

更改概述

• modified: src/config.h
• modified: src/localexec.c

差异

--- a/src/config.h
+++ b/src/config.h
@@ -36,13 +36,14 @@
 	#define	VMTUI_CONFIG_EXTERN	extern
 #endif
 
-#define	SHELL_DEFAULT_PATH		"/bin/sh"
-#define	SHELL_DEFAULT_PATH_LEN	7
-#define	OPENSSH_DEFAULT_PATH	"/usr/bin/ssh"
-#define	SUDO_DEFAULT_PATH		"/usr/local/bin/sudo"
-#define	VNCVIEWER_DEFAULT_PATH	"/usr/local/bin/vncviewer"
-#define	XTERMINAL_DEFAULT_PATH	"/usr/local/bin/xterm"
-#define	VMBHYVE_DEFAULT_PATH	"/usr/local/sbin/vm"
+#define	SHELL_DEFAULT_PATH			"/bin/sh"
+#define	SHELL_DEFAULT_PATH_LEN		7
+#define	OPENSSH_DEFAULT_PATH		"/usr/bin/ssh"
+#define	SUDO_DEFAULT_PATH			"/usr/local/bin/sudo"
+#define	VNCVIEWER_DEFAULT_PATH		"/usr/local/bin/vncviewer"
+#define	XTERMINAL_DEFAULT_PATH		"/usr/local/bin/xterm"
+#define	VMBHYVE_DEFAULT_PATH		"/usr/local/sbin/vm"
+#define	VMBHYVE_DEFAULT_PATH_LEN	18
 
 #endif
 

--- a/src/localexec.c
+++ b/src/localexec.c
@@ -222,22 +222,38 @@ int
 			i_remain			-= i_len;
 			pstr_now			+= i_len;
 
-			strncpy( pstr_now, " | /usr/local/bin/sudo -S -v; ", i_remain );
-			i_remain			-= 30;
-			pstr_now			+= 30;
+			strncpy( pstr_now, " | ", i_remain );
+			i_remain			-= 3;
+			pstr_now			+= 3;
+
+			strncpy( pstr_now, p_hvisor->sudo.path.str_path, i_remain );
+			i_remain			-= p_hvisor->sudo.path.i_len;
+			pstr_now			+= p_hvisor->sudo.path.i_len;
+
+			strncpy( pstr_now, " -S -v; ", i_remain );
+			i_remain			-= 8;
+			pstr_now			+= 8;
 		}
 
-		strncpy( pstr_now, "/usr/local/bin/sudo -s ", i_remain );
-		i_remain			-= 23;
-		pstr_now			+= 23;
+		strncpy( pstr_now, p_hvisor->sudo.path.str_path, i_remain );
+		i_remain			-= p_hvisor->sudo.path.i_len;
+		pstr_now			+= p_hvisor->sudo.path.i_len;
+
+		strncpy( pstr_now, " -s ", i_remain );
+		i_remain			-= 4;
+		pstr_now			+= 4;
 
 		// XXX sudo option
 
 	}
 
-	strncpy( pstr_now, "/usr/local/sbin/vm console ", i_remain );
-	i_remain			-= 27;
-	pstr_now			+= 27;
+	strncpy( pstr_now, VMBHYVE_DEFAULT_PATH, VMBHYVE_DEFAULT_PATH_LEN );
+	i_remain			-= VMBHYVE_DEFAULT_PATH_LEN;
+	pstr_now			+= VMBHYVE_DEFAULT_PATH_LEN;
+
+	strncpy( pstr_now, " console ", i_remain );
+	i_remain			-= 9;
+	pstr_now			+= 9;
 
 	i_len	= strnlen( str_vmname, GUEST_MAXLEN_NAME );
 	strncpy( pstr_now, str_vmname, i_remain );
@@ -248,7 +264,6 @@ int
 		strncpy( pstr_now, "\"", i_remain );
 		i_remain			-= 1 + 1;
 		pstr_now			+= 1 + 1;
-
 	}
 
 	HVisor_Release( p_hvisor );