Fix loading shipped config when using a prefix other than /usr

Also remove recommendation to modify `/usr/share/gamemode/gamemode.ini`.
`/usr/share` is intended to contain read-only data files.

See https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch04s11.html.
This commit is contained in:
Kira Bruneau
2021-05-16 22:37:29 -04:00
committed by afayaz-feral
parent 126e67fb6b
commit 5e366bd55d
4 changed files with 7 additions and 5 deletions

View File

@@ -35,6 +35,8 @@ POSSIBILITY OF SUCH DAMAGE.
#include "common-helpers.h"
#include "common-logging.h"
#include "build-config.h"
/* Ben Hoyt's inih library */
#include <ini.h>
@@ -277,9 +279,7 @@ static int inih_handler(void *user, const char *section, const char *name, const
"The [gpu] config section is not configurable from unsafe config files! Option %s "
"will be ignored!\n",
name);
LOG_ERROR(
"Consider moving this option to /etc/gamemode.ini or "
"/usr/share/gamemode/gamemode.ini\n");
LOG_ERROR("Consider moving this option to /etc/gamemode.ini\n");
}
/* GPU subsection */
@@ -378,7 +378,7 @@ static void load_config_files(GameModeConfig *self)
bool protected;
};
struct ConfigLocation locations[CONFIG_NUM_LOCATIONS] = {
{ "/usr/share/gamemode", true }, /* shipped default config */
{ SYSCONFDIR, true }, /* shipped default config */
{ "/etc", true }, /* administrator config */
{ config_location_home, false }, /* $XDG_CONFIG_HOME or $HOME/.config/ */
{ config_location_local, false } /* local data eg. $PWD */