Merge branch 'OpenAtom-Linyaps:master' into master

Author: dengbo11

libs/linglong/src/linglong/repo/ostree_repo.cpp

@@ -358,6 +358,50 @@ utils::error::Result<QString> commitDirToRepo(std::vector<GFile *> dirs,
     return commit;
 }
 
+utils::error::Result<void> initOstreeRepoConfig(
+  OstreeRepo *repo, const linglong::api::types::v1::RepoConfigV2 &config) noexcept
+{
+    LINGLONG_TRACE("init ostree repo config");
+    g_autoptr(GError) gErr = nullptr;
+
+    const auto &defaultRepo = getDefaultRepo(config);
+
+    g_auto(GStrv) remoteNames = ostree_repo_remote_list(repo, nullptr);
+    if (remoteNames) {
+        return LINGLONG_OK;
+    }
+    const std::string &remoteUrl = defaultRepo.url + "/repos/" + defaultRepo.name;
+    g_autoptr(GVariant) options = NULL;
+    GVariantBuilder builder;
+    g_variant_builder_init(&builder, G_VARIANT_TYPE("a{sv}"));
+    g_variant_builder_add(&builder, "{sv}", "gpg-verify", g_variant_new_boolean(FALSE));
+    g_variant_builder_add(&builder, "{sv}", "http2", g_variant_new_boolean(FALSE));
+    options = g_variant_ref_sink(g_variant_builder_end(&builder));
+
+    if (ostree_repo_remote_change(repo,
+                                  nullptr,
+                                  OSTREE_REPO_REMOTE_CHANGE_ADD,
+                                  defaultRepo.alias.value_or(defaultRepo.name).c_str(),
+                                  remoteUrl.c_str(),
+                                  options,
+                                  nullptr,
+                                  &gErr)
+        == FALSE) {
+        return LINGLONG_ERR("ostree_repo_remote_change", gErr);
+    }
+
+    GKeyFile *configKeyFile = ostree_repo_get_config(repo);
+    Q_ASSERT(configKeyFile != nullptr);
+
+    g_key_file_set_string(configKeyFile, "core", "min-free-space-size", "600MB");
+
+    if (ostree_repo_write_config(repo, configKeyFile, &gErr) == FALSE) {
+        return LINGLONG_ERR("ostree_repo_write_config", gErr);
+    }
+
+    return LINGLONG_OK;
+}
+
 utils::error::Result<void>
 updateOstreeRepoConfig(OstreeRepo *repo,
                        const linglong::api::types::v1::RepoConfigV2 &config,
@@ -432,7 +476,6 @@ updateOstreeRepoConfig(OstreeRepo *repo,
 
     GKeyFile *configKeyFile = ostree_repo_get_config(repo);
     Q_ASSERT(configKeyFile != nullptr);
-    QDir a;
 
     g_key_file_set_string(configKeyFile, "core", "min-free-space-size", "600MB");
     if (!parent.isEmpty()) {
@@ -466,6 +509,7 @@ createOstreeRepo(const QDir &location,
     repoPath = g_file_new_for_path(location.absolutePath().toUtf8());
     ostreeRepo = ostree_repo_new(repoPath);
     Q_ASSERT(ostreeRepo != nullptr);
+
     if (ostree_repo_create(ostreeRepo, OSTREE_REPO_MODE_BARE_USER_ONLY, nullptr, &gErr) == FALSE) {
         return LINGLONG_ERR("ostree_repo_create", gErr);
     }
@@ -722,13 +766,20 @@ OSTreeRepo::OSTreeRepo(const QDir &path,
     g_autoptr(OstreeRepo) ostreeRepo = nullptr;
 
     this->repoDir = path;
+
     {
         LINGLONG_TRACE("use linglong repo at " + path.absolutePath());
 
         repoPath = g_file_new_for_path(this->ostreeRepoDir().absolutePath().toLocal8Bit());
         ostreeRepo = ostree_repo_new(repoPath);
         Q_ASSERT(ostreeRepo != nullptr);
         if (ostree_repo_open(ostreeRepo, nullptr, &gErr) == TRUE) {
+            auto result = initOstreeRepoConfig(ostreeRepo, this->cfg);
+            if (!result) {
+                qCritical() << LINGLONG_ERRV(result);
+                qFatal("abort");
+            }
+
             this->ostreeRepo.reset(static_cast<OstreeRepo *>(g_steal_pointer(&ostreeRepo)));
 
             auto ret = linglong::repo::RepoCache::create(