diff --git a/interfaces/innerkits/fs_manager/fstab_mount.c b/interfaces/innerkits/fs_manager/fstab_mount.c index de34b7b3d95b3d63cfcc044647fab684b08fca33..6b240e965c2aab256d4ff5dbacd6077a915318b8 100644 --- a/interfaces/innerkits/fs_manager/fstab_mount.c +++ b/interfaces/innerkits/fs_manager/fstab_mount.c @@ -61,6 +61,7 @@ static int ExecCommand(int argc, char **argv) if (argc == 0 || argv == NULL || argv[0] == NULL) { return -1; } + BEGET_LOGI("Execute %s begin", argv[0]); pid_t pid = fork(); if (pid < 0) { BEGET_LOGE("Fork new process to format failed: %d", errno); @@ -75,6 +76,7 @@ static int ExecCommand(int argc, char **argv) if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) { BEGET_LOGE("Command %s failed with status %d", argv[0], WEXITSTATUS(status)); } + BEGET_LOGI("Execute %s end", argv[0]); return WEXITSTATUS(status); } @@ -192,7 +194,6 @@ static int DoResizeF2fs(const char* device, const unsigned long long size) char **argv = (char **)cmd; ret = ExecCommand(argc, argv); } - BEGET_LOGI("resize.f2fs is ending."); return ret; } @@ -209,7 +210,6 @@ static int DoFsckF2fs(const char* device) }; int argc = ARRAY_LENGTH(cmd); char **argv = (char **)cmd; - BEGET_LOGI("fsck.f2fs is ending."); return ExecCommand(argc, argv); } @@ -242,7 +242,6 @@ static int DoResizeExt(const char* device, const unsigned long long size) char **argv = (char **)cmd; ret = ExecCommand(argc, argv); } - BEGET_LOGI("resize2fs is ending."); return ret; } @@ -259,7 +258,6 @@ static int DoFsckExt(const char* device) }; int argc = ARRAY_LENGTH(cmd); char **argv = (char **)cmd; - BEGET_LOGI("e2fsck is ending."); return ExecCommand(argc, argv); } @@ -287,15 +285,8 @@ static int Mount(const char *source, const char *target, const char *fsType, } } errno = 0; - while ((rc = mount(source, target, fsType, flags, data)) != 0) { - if (errno == EAGAIN) { - BEGET_LOGE("Mount %s to %s failed. try again", source, target); - continue; - } - if (errno == EBUSY) { - rc = 0; - } - break; + if ((rc = mount(source, target, fsType, flags, data)) != 0) { + BEGET_WARNING_CHECK(errno != EBUSY, rc = 0, "Mount %s to %s busy, ignore", source, target); } return rc; } diff --git a/test/unittest/init/mount_unittest.cpp b/test/unittest/init/mount_unittest.cpp index b5abd2e4f0e70d67c51aa69b45f44c86d7eaf49a..4f6b331ad5e2cacd84b990ddfcacb9ccc2c60069 100644 --- a/test/unittest/init/mount_unittest.cpp +++ b/test/unittest/init/mount_unittest.cpp @@ -34,7 +34,7 @@ public: HWTEST_F(MountUnitTest, TestMountRequriedPartitions, TestSize.Level0) { - const char *fstabFiles = "/etc/fstab.required"; + const char *fstabFiles = "/data/init_ut/etc/fstab.required"; Fstab *fstab = NULL; fstab = ReadFstabFromFile(fstabFiles, false); if (fstab != NULL) { diff --git a/test/unittest/innerkits/innerkits_unittest.cpp b/test/unittest/innerkits/innerkits_unittest.cpp index 31a24c46e04b8e7718d2f7283c810f42d862dd94..60da53222b7764a36c3d23f939aec58e0f811b99 100644 --- a/test/unittest/innerkits/innerkits_unittest.cpp +++ b/test/unittest/innerkits/innerkits_unittest.cpp @@ -218,7 +218,7 @@ HWTEST_F(InnerkitsUnitTest, DoFormat_unittest, TestSize.Level1) */ HWTEST_F(InnerkitsUnitTest, MountAllWithFstabFile_unittest, TestSize.Level1) { - EXPECT_NE(MountAllWithFstabFile("/etc/fstab.required", 0), 1); + EXPECT_NE(MountAllWithFstabFile("/data/init_ut/etc/fstab.required", 0), 1); } HWTEST_F(InnerkitsUnitTest, others_unittest, TestSize.Level1) diff --git a/test/unittest/param/param_stub.cpp b/test/unittest/param/param_stub.cpp index 9a1890fb4400f20dde98e1321ef0b0a4ee7471b5..66caa17392ce999dfa868849ade28919f3ed173f 100644 --- a/test/unittest/param/param_stub.cpp +++ b/test/unittest/param/param_stub.cpp @@ -207,14 +207,14 @@ static void PrepareInnerKitsCfg() "aa aa aa aa\n"; const char *fstabRequired = "# fstab file.\n" "# \n" - "/dev/block/platform/fe310000.sdhci/by-name/testsystem /usr ext4 ro,barrier=1 wait,required\n" + "/dev/block/platform/fe310000.sdhci/by-name/testsystem /usr ext4 ro,barrier=1 wait,required,nofail\n" "/dev/block/platform/fe310000.sdhci/by-name/testvendor /vendor ext4 ro,barrier=1 wait,required\n" "/dev/block/platform/fe310000.sdhci/by-name/testuserdata1 /data f2fs noatime,nosuid,nodev wait,check,quota\n" "/dev/block/platform/fe310000.sdhci/by-name/testuserdata2 /data ext4 noatime,fscrypt=xxx wait,check,quota\n" "/dev/block/platform/fe310000.sdhci/by-name/testmisc /misc none none wait,required"; mkdir("/data/init_ut/mount_unitest/", S_IRWXU | S_IRWXG | S_IRWXO); CreateTestFile("/data/init_ut/mount_unitest/ReadFstabFromFile1.fstable", innerKitsCfg); - CreateTestFile("/etc/fstab.required", fstabRequired); + CreateTestFile("/data/init_ut/etc/fstab.required", fstabRequired); } static void PrepareGroupTestCfg() {