diff options
| author | Matthew Leeds <matthew.leeds@endlessm.com> | 2020-06-19 15:49:08 -0700 |
|---|---|---|
| committer | Alexander Larsson <alexander.larsson@gmail.com> | 2020-06-23 09:37:10 +0200 |
| commit | 5a646117c9ec5357c55bc3d196e05a47aa409c66 (patch) | |
| tree | ca66fc705e322199c01ddb394faa7642bf23a46f | |
| parent | 9caf664fabc911419cc483125bf543c4550604c7 (diff) | |
| download | flatpak-5a646117c9ec5357c55bc3d196e05a47aa409c66.tar.gz | |
Don't mention $FLATPAK_RUN_DIR in docs
We only want the run dir to be overridable in unit tests because we
depend on it being /run/flatpak in flatpak-create-sideload-symlinks.sh,
so don't mention it in the flatpak man page.
| -rw-r--r-- | common/flatpak-dir.c | 4 | ||||
| -rw-r--r-- | doc/flatpak.xml | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c index bfbf994b..545d3346 100644 --- a/common/flatpak-dir.c +++ b/common/flatpak-dir.c @@ -283,6 +283,10 @@ get_run_dir_location (void) if (g_once_init_enter (&path)) { gsize setup_value = 0; + /* Note: $FLATPAK_RUN_DIR should only be set in the unit tests. At + * runtime, /run/flatpak is assumed by + * flatpak-create-sideload-symlinks.sh + */ const char *config_dir = g_getenv ("FLATPAK_RUN_DIR"); if (config_dir != NULL) setup_value = (gsize) config_dir; diff --git a/doc/flatpak.xml b/doc/flatpak.xml index e0af8724..77e9940c 100644 --- a/doc/flatpak.xml +++ b/doc/flatpak.xml @@ -96,10 +96,9 @@ in the <filename>sideload-repos</filename> subdirectory of the installation directory (i.e. typically <filename>/var/lib/flatpak/sideload-repos</filename>). Additionally symlinks can be created in <filename>/run/flatpak/sideload-repos</filename> - (overridable by <envar>FLATPAK_RUN_DIR</envar>) which is a better location - for non-persistent sources (as it is cleared on reboot). These symlinks can point to either the - directory given to <command>flatpak create-usb</command> which by default writes to the subpath - <filename>.ostree/repo</filename>, or directly to an ostree repo. + which is a better location for non-persistent sources (as it is cleared on reboot). These symlinks + can point to either the directory given to <command>flatpak create-usb</command> which by default + writes to the subpath <filename>.ostree/repo</filename>, or directly to an ostree repo. </para> </refsect1> |