opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(host): compatible with python3

Browse Source 
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
This commit is contained in:
wanyaoqi
2023-04-25 22:32:14 +08:00
parent 7324d99748
commit dd5f4cee0f
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/guestman/qemu-kvm.go
+1 -1
View File
@@ -1712,7 +1712,7 @@ func (s *SKVMGuestInstance) pyLauncherPath() string {
}
func (s *SKVMGuestInstance) scriptStart(ctx context.Context) error {
output, err := procutils.NewRemoteCommandAsFarAsPossible("python2", s.pyLauncherPath()).Output()
output, err := procutils.NewRemoteCommandAsFarAsPossible("python", s.pyLauncherPath()).Output()
if err != nil {
return fmt.Errorf("Start VM Failed %s %s", output, err)
}
pkg/hostman/guestman/qemu-kvmhelper.go
+2 -3
View File
@@ -63,8 +63,7 @@ const (
DISK_DRIVER_SATA = qemu.DISK_DRIVER_SATA
)
const guestLauncher = `
#!/usr/bin/env python
const guestLauncher = `#!/usr/bin/env python
import sys
import os
import time
@@ -111,7 +110,7 @@ else:
logfd = os.open('%s', os.O_RDWR|os.O_CREAT|os.O_APPEND)
os.dup2(logfd, 1)
os.dup2(logfd, 2)
os.write(logfd, '%%s Run command: %%s\n' %% (time.strftime('%%Y-%%m-%%d %%H:%%M:%%S', time.localtime()), cmd))
os.write(logfd, str.encode('%%s Run command: %%s\n' %% (time.strftime('%%Y-%%m-%%d %%H:%%M:%%S', time.localtime()), cmd)))
os.close(logfd)
if os.execv(cmd[0], cmd) < 0: