修改优化代码

myir-mkupdate-sdcard/build.sh

@@ -2,11 +2,20 @@
 
 set -e
 
+copy_if() {
+    if [ ! -f "$1" ]; then
+        echo "❌ missing source file: $1"
+        exit 1
+    fi
+
+    mkdir -p "$2" && cp -f "$1" "$2" || exit 1
+}
+
 echo "1, 查找 rootfs 根文件系统..."
 
-TAG_ROOTFS="./mfgimages-myd-y6ull-ddr512m-emmc4g-base/rice-roofs.tar.bz2"
-if [ ! -f "$TAG_ROOTFS" ]; then
-    echo "File not found: $TAG_ROOTFS"
+ROOTFS_TAR="./mfgimages-myd-y6ull-ddr512m-emmc4g-base/rice-roofs.tar.bz2"
+if [ ! -f "$ROOTFS_TAR" ]; then
+    echo "File not found: $ROOTFS_TAR"
     exit 1
 fi
 
@@ -15,16 +24,22 @@ echo "2, 解压 rootfs 根文件系统..."
 MY_WORKDIR="./rice-rootfs"
 rm -rf "$MY_WORKDIR" && mkdir -p "$MY_WORKDIR"
 
-tar -xjf "$TAG_ROOTFS" -C "$MY_WORKDIR"
+tar -xjf "$ROOTFS_TAR" -C "$MY_WORKDIR"
 
 echo "3, 更新 rootfs 根文件系统..."
-# Add your update commands here
+
+ROOTFS_OPT="$MY_WORKDIR/opt/yfkj"
+MYBINS_DIR="../build"
+
+copy_if "$MYBINS_DIR/networkd"  "$ROOTFS_OPT/networkd.service/a"
+copy_if "$MYBINS_DIR/timesyncd" "$ROOTFS_OPT/timesyncd.service/a"
 
 echo "4, 压缩 rootfs 根文件系统..."
 
-TMP_ROOTFS="${TAG_ROOTFS}.tmp"
+TMP_ROOTFS="${ROOTFS_TAR}.tmp"
+
 tar -cjf "$TMP_ROOTFS" -C "$MY_WORKDIR" .
-mv "$TMP_ROOTFS" "$TAG_ROOTFS"
+mv "$TMP_ROOTFS" "$ROOTFS_TAR"
 
 rm -rf "$MY_WORKDIR" # Clean up the temporary directory
 

networkd.service/main.go

@@ -36,9 +36,6 @@ type program struct {
 
 // Start should not block. Do the actual work async.
 func (p *program) Start(s service.Service) error {
-	baseapp.SetOptDirs(true, true, false, false)
-	baseapp.InitPath()
-
 	logCfgFile, err := servicelib.EnsureDefaultLogConfig()
 	if err != nil {
 		return err
@@ -129,6 +126,9 @@ func (p *program) Stop(s service.Service) error {
 }
 
 func main() {
+	baseapp.SetOptDirs(true, true, false, false)
+	baseapp.InitPath()
+
 	svcFlag := flag.String("service", "", "Control the system service.")
 	flag.Parse()
 

timesyncd.service/main.go

@@ -38,9 +38,6 @@ type program struct {
 
 // Start should not block. Do the actual work async.
 func (p *program) Start(s service.Service) error {
-	baseapp.SetOptDirs(true, false, false, false)
-	baseapp.InitPath()
-
 	logCfgFile, err := servicelib.EnsureDefaultLogConfig()
 	if err != nil {
 		return err
@@ -173,6 +170,9 @@ func (p *program) maintainSystemTime() {
 }
 
 func main() {
+	baseapp.SetOptDirs(true, false, false, false)
+	baseapp.InitPath()
+
 	svcFlag := flag.String("service", "", "Control the system service.")
 	flag.Parse()