From dd2450d7ad7c4e351d106515b161eab8a7ebf233 Mon Sep 17 00:00:00 2001
From: wanyaoqi <18528551+wanyaoqi@users.noreply.github.com>
Date: Sat, 27 Sep 2025 12:02:21 +0800
Subject: [PATCH] Automated cherry pick of #23394: Automated cherry pick of
 #23386: fix(host-deployer): allow growpart on primary partition (#23395)

* fix(host): init cgroup ignore disable cgroup option

* fix(host-deployer): allow growpart on primary partition
---
 pkg/hostman/diskutils/fsutils/fsutils.go | 2 +-
 pkg/hostman/hostinfo/hostinfo.go         | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkg/hostman/diskutils/fsutils/fsutils.go b/pkg/hostman/diskutils/fsutils/fsutils.go
index 38bfec3115..91bf2d0190 100644
--- a/pkg/hostman/diskutils/fsutils/fsutils.go
+++ b/pkg/hostman/diskutils/fsutils/fsutils.go
@@ -180,7 +180,7 @@ func (d *SFsutilDriver) ResizeDiskPartition(diskPath string, sizeMb int) (string
 			fsType = d.GetFsFormat(partDev)
 			log.Infof("blkid get fstype %s", fsType)
 		}
-		if part[5] == "lvm" || IsSupportResizeFs(fsType) {
+		if part[5] == "lvm" || IsSupportResizeFs(fsType) || part[5] == "primary" {
 			// growpart script replace parted resizepart
 			output, err := d.Exec("growpart", diskPath, part[0])
 			if err != nil {
diff --git a/pkg/hostman/hostinfo/hostinfo.go b/pkg/hostman/hostinfo/hostinfo.go
index 1e8c82074b..d4bdc4fe5b 100644
--- a/pkg/hostman/hostinfo/hostinfo.go
+++ b/pkg/hostman/hostinfo/hostinfo.go
@@ -524,12 +524,11 @@ func (h *SHostInfo) prepareEnv() error {
 	if err != nil {
 		log.Warningf("modprobe vhost_net error: %s", output)
 	}
-	if !options.HostOptions.DisableSetCgroup {
-		if err := cgrouputils.Init(h.IoScheduler); err != nil {
-			return fmt.Errorf("Cannot initialize control group subsystem: %s", err)
-		}
-		h.sysinfo.CgroupVersion = cgrouputils.GetCgroupVersion()
+
+	if err := cgrouputils.Init(h.IoScheduler); err != nil {
+		return fmt.Errorf("Cannot initialize control group subsystem: %s", err)
 	}
+	h.sysinfo.CgroupVersion = cgrouputils.GetCgroupVersion()
 
 	// err = h.resetIptables()
 	// if err != nil {