Default to bare-user-only repo

This means we work on systems without xattrs
Old installations keep using bare-user, and you can use
FLATPAK_OSTREE_REPO_MODE=user to force it.
tingping/wmclass
Alexander Larsson 2017-06-16 12:20:49 +02:00
parent 1e07f79b57
commit 66e60be49d
1 changed files with 6 additions and 9 deletions

View File

@ -1440,16 +1440,13 @@ flatpak_dir_ensure_repo (FlatpakDir *self,
if (!g_file_query_exists (repodir, cancellable))
{
OstreeRepoMode mode = OSTREE_REPO_MODE_BARE_USER;
OstreeRepoMode mode = OSTREE_REPO_MODE_BARE_USER_ONLY;
const char *mode_env = g_getenv ("FLATPAK_OSTREE_REPO_MODE");
#if OSTREE_CHECK_VERSION(2017, 3)
{
const char *mode_env = g_getenv ("FLATPAK_OSTREE_REPO_MODE");
if (g_strcmp0 (mode_env, "user-only") == 0)
mode = OSTREE_REPO_MODE_BARE_USER_ONLY;
}
#endif
if (g_strcmp0 (mode_env, "user-only") == 0)
mode = OSTREE_REPO_MODE_BARE_USER_ONLY;
if (g_strcmp0 (mode_env, "user") == 0)
mode = OSTREE_REPO_MODE_BARE_USER;
if (!ostree_repo_create (repo, mode, cancellable, error))
{