fix: improve gfxmode signal file creation safety

grub2/grub2_ifc.go

@@ -6,7 +6,6 @@ package grub2
 
 import (
 	"errors"
-	"os"
 	"strings"
 
 	"github.com/godbus/dbus/v5"
@@ -316,7 +315,7 @@ func (g *Grub2) PrepareGfxmodeDetect(sender dbus.Sender) *dbus.Error {
 
 	g.addModifyTask(getModifyTaskPrepareGfxmodeDetect(gfxmodesStr))
 
-	err = os.WriteFile(grub_common.GfxmodeDetectReadyPath, nil, 0644)
+	err = grub_common.CreateGfxmodeDetectReady()
 	if err != nil {
 		return dbusutil.ToError(err)
 	}

grub2/main.go

@@ -81,7 +81,7 @@ func PrepareGfxmodeDetect() error {
 	gfxmodesStr := joinGfxmodesForDetect(gfxmodes)
 	getModifyFuncPrepareGfxmodeDetect(gfxmodesStr)(params)
 
-	err = os.WriteFile(grub_common.GfxmodeDetectReadyPath, nil, 0644)
+	err = grub_common.CreateGfxmodeDetectReady()
 	if err != nil {
 		return err
 	}

grub_common/common.go

@@ -28,7 +28,7 @@ var logger = log.NewLogger("grub_common")
 const (
 	GrubParamsFile            = "/etc/default/grub"
 	DDEGrubParamsFile         = "/etc/default/grub.d/11_dde.cfg"
-	GfxmodeDetectReadyPath    = "/tmp/deepin-gfxmode-detect-ready"
+	GfxmodeDetectReadyPath    = "/run/deepin-gfxmode-detect/ready"
 	DeepinGfxmodeDetect       = "DEEPIN_GFXMODE_DETECT"
 	DeepinGfxmodeAdjusted     = "DEEPIN_GFXMODE_ADJUSTED"
 	DeepinGfxmodeNotSupported = "DEEPIN_GFXMODE_NOT_SUPPORTED"
@@ -265,6 +265,21 @@ func (v Gfxmodes) SortDesc() {
 	sort.Sort(sort.Reverse(v))
 }
 
+// CreateGfxmodeDetectReady 创建 gfxmode 探测完成信号文件。
+//
+// MkdirAll 兜底 unit 外调用（如 postinst 的 `grub2 -prepare-gfxmode-detect`）——此时无
+// RuntimeDirectory 托管父目录；服务内调用时父目录已由 systemd 建好，MkdirAll 为 no-op。
+func CreateGfxmodeDetectReady() error {
+	dir := filepath.Dir(GfxmodeDetectReadyPath)
+	if err := os.MkdirAll(dir, 0755); err != nil {
+		return fmt.Errorf("failed to mkdir %s: %w", dir, err)
+	}
+	if err := os.WriteFile(GfxmodeDetectReadyPath, nil, 0644); err != nil {
+		return fmt.Errorf("failed to create %s: %w", GfxmodeDetectReadyPath, err)
+	}
+	return nil
+}
+
 func ShouldFinishGfxmodeDetect(params map[string]string) bool {
 	if params[DeepinGfxmodeDetect] == "1" {
 		_, err := os.Stat(GfxmodeDetectReadyPath)

misc/systemd/services/system/deepin-grub2.service

@@ -16,7 +16,9 @@ InaccessiblePaths=-/etc/pam.d
 #InaccessiblePaths=-/usr/share/uadp/
 # 创建/etc/default/grub.d/11_dde.cfg
 ReadWritePaths=-/etc/default/grub.d
-# 创建/tmp/deepin-gfxmode-detect-ready // TODO分析该文件是否有被其他进程使用，该文件存放需要修改
+# /run/deepin-gfxmode-detect/ready，作为 gfxmode 探测完成信号文件
+RuntimeDirectory=deepin-gfxmode-detect
+RuntimeDirectoryPreserve=yes
 ReadWritePaths=-/tmp/
 # /var/cache/deepin/grub2.log
 ReadWritePaths=-/var/cache/deepin