fix: Remove unused GRUB operation logic

src/internal/system/common.go

@@ -11,13 +11,10 @@ import (
 	"io"
 	"os"
 	"os/exec"
-	"regexp"
 	"strconv"
 	"strings"
 	"syscall"
-	"unicode"
 
-	grub2 "github.com/linuxdeepin/go-dbus-factory/com.deepin.daemon.grub2"
 	license "github.com/linuxdeepin/go-dbus-factory/system/com.deepin.license"
 	"github.com/linuxdeepin/go-lib/dbusutil"
 	"github.com/linuxdeepin/go-lib/keyfile"
@@ -157,92 +154,6 @@ const (
 	ErrorNeedCheck JobErrorType = "needCheck"
 )
 
-const (
-	GrubTitleRollbackPrefix = "BEGIN /etc/grub.d/11_deepin_ab_recovery"
-	GrubTitleRollbackSuffix = "END /etc/grub.d/11_deepin_ab_recovery"
-	GrubTitleNormalPrefix   = "BEGIN /etc/grub.d/15_immutable"
-	GrubTitleNormalSuffix   = "END /etc/grub.d/15_immutable"
-)
-
-func GetGrubRollbackTitle(grubPath string) string {
-	return getGrubTitleByPrefix(grubPath, GrubTitleRollbackPrefix, GrubTitleRollbackSuffix)
-}
-
-func GetGrubNormalTitle(grubPath string) string {
-	return getGrubTitleByPrefix(grubPath, GrubTitleNormalPrefix, GrubTitleNormalSuffix)
-}
-
-func getGrubTitleByPrefix(grubPath string, start, end string) (entryTitle string) {
-	fileContent, err := os.ReadFile(grubPath)
-	if err != nil {
-		logger.Warning(err)
-		return ""
-	}
-	sl := bufio.NewScanner(strings.NewReader(string(fileContent)))
-	sl.Split(bufio.ScanLines)
-	needNext := false
-	for sl.Scan() {
-		line := sl.Text()
-		line = strings.TrimSpace(line)
-		if !needNext {
-			needNext = strings.Contains(line, start)
-		} else {
-			if strings.Contains(line, end) {
-				logger.Warningf("%v not found %v entry", grubPath, start)
-				return ""
-			}
-			if strings.HasPrefix(line, "menuentry ") {
-				title, ok := parseTitle(line)
-				if ok {
-					entryTitle = title
-					break
-				} else {
-					logger.Warningf("parse entry title failed from: %q", line)
-					return ""
-				}
-			}
-		}
-	}
-	err = sl.Err()
-	if err != nil {
-		return ""
-	}
-	return entryTitle
-}
-
-// getGrubTitleByIndex index 的起始值是0
-func getGrubTitleByIndex(grub grub2.Grub2, index int) (entryTitle string) {
-	if grub == nil {
-		return ""
-	}
-	entryList, err := grub.GetSimpleEntryTitles(0)
-	if err != nil {
-		logger.Warning(err)
-		return ""
-	}
-	if len(entryList) < index+1 {
-		logger.Warningf(" index:%v out of range", index)
-		return ""
-	}
-	return entryList[index]
-}
-
-var (
-	entryRegexpSingleQuote = regexp.MustCompile(`^ *(menuentry|submenu) +'(.*?)'.*$`)
-	entryRegexpDoubleQuote = regexp.MustCompile(`^ *(menuentry|submenu) +"(.*?)".*$`)
-)
-
-func parseTitle(line string) (string, bool) {
-	line = strings.TrimLeftFunc(line, unicode.IsSpace)
-	if entryRegexpSingleQuote.MatchString(line) {
-		return entryRegexpSingleQuote.FindStringSubmatch(line)[2], true
-	} else if entryRegexpDoubleQuote.MatchString(line) {
-		return entryRegexpDoubleQuote.FindStringSubmatch(line)[2], true
-	} else {
-		return "", false
-	}
-}
-
 func HandleDelayPackage(hold bool, packages []string) {
 	action := "unhold"
 	if hold {

src/internal/system/common_test.go

@@ -32,10 +32,3 @@ func Test_GetCategorySourceMap(t *testing.T) {
 	sourceMap = GetCategorySourceMap()
 	assert.Equal(t, SoftLinkSystemSourceDir, sourceMap[SystemUpdate])
 }
-
-func Test_getGrubTitleByPrefix(t *testing.T) {
-	title := getGrubTitleByPrefix("./testdata/grub.cfg", "BEGIN /etc/grub.d/10_linux", "END /etc/grub.d/10_linux")
-	assert.Equal(t, "UnionTech OS Desktop 20 Pro GNU/Linux", title)
-	title = getGrubTitleByPrefix("./testdata/grub.cfg", "BEGIN /etc/grub.d/11_deepin_ab_recovery", "END /etc/grub.d/11_deepin_ab_recovery")
-	assert.Equal(t, "回退到 UOS Desktop 20 Professional（2023/5/19 10:33:44）", title)
-}

src/lastore-daemon/manager.go

@@ -92,7 +92,6 @@ type Manager struct {
 	sysDBusDaemon ofdbus.DBus
 	systemd       systemd1.Manager
 
-	grub             *grubManager
 	userAgents       *userAgentMap // 闲时退出时，需要保存数据，启动时需要根据uid,agent sender以及session path完成数据恢复
 	statusManager    *UpdateModeStatusManager
 	updatePlatform   *updateplatform.UpdatePlatformManager
@@ -140,7 +139,6 @@ func NewManager(service *dbusutil.Service, updateApi system.System, c *config.Co
 	}
 	m.reloadOemConfig(true)
 	m.signalLoop.Start()
-	m.grub = newGrubManager(service.Conn(), m.signalLoop)
 	m.jobManager = NewJobManager(service, updateApi, m.updateJobList, m.processLogFds)
 	m.immutableManager = newImmutableManager(m.jobManager.handleJobProgressInfo)
 	go m.handleOSSignal()

src/lastore-daemon/manager_ifc.go

@@ -646,12 +646,6 @@ func (m *Manager) ConfirmRollback(sender dbus.Sender, confirm bool) *dbus.Error
 		if err != nil {
 			logger.Warning(err)
 		}
-		if m.grub != nil {
-			err = m.grub.changeGrubDefaultEntry(normalBootEntry)
-			if err != nil {
-				logger.Warning(err)
-			}
-		}
 
 		if needReboot {
 			err := m.PowerOff(sender, true)