diff --git a/pkg/hostman/diskutils/fsutils.go b/pkg/hostman/diskutils/fsutils.go index c3d2d4fa9e..cd418f3b33 100644 --- a/pkg/hostman/diskutils/fsutils.go +++ b/pkg/hostman/diskutils/fsutils.go @@ -303,7 +303,7 @@ func FsckXfsFs(fpath string) bool { func Mkpartition(imagePath, fsFormat string) error { var ( - parted = "/sbin/parted" + parted = "parted" labelType = "gpt" diskType = fileutils2.FsFormatToDiskType(fsFormat) ) @@ -352,7 +352,7 @@ func FormatPartition(path, fs, uuid string) error { // #case fs == "ntfs": // # cmd = []string{"/sbin/mkfs.ntfs"} case fs == "xfs": - cmd = []string{"/sbin/mkfs.xfs", "-f", "-m", "crc=0", "-i", "projid32bit=0", "-n", "ftype=0"} + cmd = []string{"mkfs.xfs", "-f", "-m", "crc=0", "-i", "projid32bit=0", "-n", "ftype=0"} cmdUuid = []string{"xfs_admin", "-U", uuid} } diff --git a/pkg/util/fuseutils/fuseutils.go b/pkg/util/fuseutils/fuseutils.go index d5a725a814..378e78ce07 100644 --- a/pkg/util/fuseutils/fuseutils.go +++ b/pkg/util/fuseutils/fuseutils.go @@ -61,7 +61,7 @@ func MountFusefs(fetcherfsPath, url, tmpdir, token, mntpath string, blocksize in var cmd = []string{fetcherfsPath, "-s", "-o", opts, mntpath} log.Infof("%s", strings.Join(cmd, " ")) - err := procutils.NewCommand(cmd[0], cmd[1:]...).Run() + err := procutils.NewRemoteCommandAsFarAsPossible(cmd[0], cmd[1:]...).Run() if err != nil { log.Errorf("Mount fetcherfs filed: %s", err) procutils.NewCommand("umount", mntpath).Run() diff --git a/pkg/util/sysutils/kvm.go b/pkg/util/sysutils/kvm.go index 5d21c5e7cd..bf733d548f 100644 --- a/pkg/util/sysutils/kvm.go +++ b/pkg/util/sysutils/kvm.go @@ -96,13 +96,16 @@ func detectiveKVMModuleSupport() string { func ModprobeKvmModule(name string, remove, nest bool) bool { var params = []string{"modprobe"} if remove { - params = append(params, "-r") + if err := procutils.NewCommand("rmmod", name).Run(); err != nil { + log.Errorf("rmmod failed %s: %s", name, err) + } } params = append(params, name) if nest { params = append(params, "nested=1") } if err := procutils.NewCommand(params[0], params[1:]...).Run(); err != nil { + log.Errorf("Modprobe kvm %v failed: %s", params, err) return false } return true