diff --git a/pkg/hostman/guestman/qemu-kvm.go b/pkg/hostman/guestman/qemu-kvm.go index 240a5ffca5..874964bdfb 100644 --- a/pkg/hostman/guestman/qemu-kvm.go +++ b/pkg/hostman/guestman/qemu-kvm.go @@ -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) } diff --git a/pkg/hostman/guestman/qemu-kvmhelper.go b/pkg/hostman/guestman/qemu-kvmhelper.go index d585e080e0..ee3eeaac2e 100644 --- a/pkg/hostman/guestman/qemu-kvmhelper.go +++ b/pkg/hostman/guestman/qemu-kvmhelper.go @@ -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: diff --git a/pkg/util/cgrouputils/cgrouputils.go b/pkg/util/cgrouputils/cgrouputils.go index a4dc7cd5c9..a68b0dc636 100644 --- a/pkg/util/cgrouputils/cgrouputils.go +++ b/pkg/util/cgrouputils/cgrouputils.go @@ -380,10 +380,14 @@ func (c *CGroupTask) init() bool { re := regexp.MustCompile(`\s+`) scanner := bufio.NewScanner(file) for scanner.Scan() { + // #subsys_name hierarchy num_cgroups enabled line := scanner.Text() if line[0] != '#' { parts := re.Split(line, -1) module := parts[0] + if parts[3] == "0" { // disabled + continue + } if !ModuleIsMounted(module) { moduleDir := path.Join(cgroupsPath, module) if !fileutils2.Exists(moduleDir) {