From 06ef97a261015bc5c52fc595c05efba0d7698427 Mon Sep 17 00:00:00 2001 From: Jian-Hong Pan Date: Wed, 28 Oct 2020 14:11:48 +0800 Subject: utils: change gdm-disable-wayland to gdm-runtime-config We can disable Wayland in runtime by invoking gdm-disable-wayland. However, we may also want to enable Wayland in runtime for some reasons. This idea is extended to modify more options/configurations in runtime. This commit renames gdm-disable-wayland to gdm-runtime-config and unlocks the feature to modify more gdm configurations in runtime. The new command format will be: gdm-runtime-config set The configurable items refer to gdm.schemas. "/" combination is the key in gdm.schemas. For example, the original "gdm-disable-wayland" is replaced by "gdm-runtime-config set daemon WaylandEnable false". Link: https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/115#note_944907 --- utils/gdm-disable-wayland.c | 53 -------------------------------- utils/gdm-runtime-config.c | 75 +++++++++++++++++++++++++++++++++++++++++++++ utils/meson.build | 10 +++--- 3 files changed, 80 insertions(+), 58 deletions(-) delete mode 100644 utils/gdm-disable-wayland.c create mode 100644 utils/gdm-runtime-config.c (limited to 'utils') diff --git a/utils/gdm-disable-wayland.c b/utils/gdm-disable-wayland.c deleted file mode 100644 index be61c4d8..00000000 --- a/utils/gdm-disable-wayland.c +++ /dev/null @@ -1,53 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2018 Red Hat, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#include "config.h" - -#include -#include -#include - -#include - -int -main (int argc, char *argv[]) -{ - g_autoptr(GKeyFile) key_file = NULL; - g_autoptr(GError) error = NULL; - gboolean saved_okay; - - setlocale (LC_ALL, ""); - - key_file = g_key_file_new (); - - g_key_file_set_boolean (key_file, "daemon", "WaylandEnable", FALSE); - - g_mkdir_with_parents (GDM_RUN_DIR, 0711); - - saved_okay = g_key_file_save_to_file (key_file, GDM_RUNTIME_CONF, &error); - - if (!saved_okay) { - g_printerr ("gdm-disable-wayland: unable to disable wayland: %s", - error->message); - return EX_CANTCREAT; - } - - return EX_OK; -} diff --git a/utils/gdm-runtime-config.c b/utils/gdm-runtime-config.c new file mode 100644 index 00000000..8034a2e5 --- /dev/null +++ b/utils/gdm-runtime-config.c @@ -0,0 +1,75 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * + * Copyright (C) 2018 Red Hat, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include "config.h" + +#include +#include +#include + +#include + +int +main (int argc, char *argv[]) +{ + g_autoptr(GKeyFile) key_file = NULL; + g_autoptr(GError) error = NULL; + gchar *group, *key, *value; + gboolean saved_okay; + + if (argc < 5 || g_strcmp0(argv[1], "set") != 0) { + g_printerr("gdm-runtime-config: command format should be " \ + "'gdm-runtime-config set '\n" \ + "For example, 'gdm-runtime-config set daemon WaylandEnable true'"); + return EX_USAGE; + } + + group = argv[2]; + key = argv[3]; + value = argv[4]; + + setlocale (LC_ALL, ""); + + key_file = g_key_file_new (); + + /* Just load the runtime conf file and ignore the error. A new file + * will be created later if it is file not found. + * So that more than one config item can be set. + */ + g_key_file_load_from_file (key_file, + GDM_RUNTIME_CONF, + G_KEY_FILE_KEEP_COMMENTS | G_KEY_FILE_KEEP_TRANSLATIONS, + &error); + g_clear_error (&error); + + g_key_file_set_value (key_file, group, key, value); + + g_mkdir_with_parents (GDM_RUN_DIR, 0711); + + saved_okay = g_key_file_save_to_file (key_file, GDM_RUNTIME_CONF, &error); + + if (!saved_okay) { + g_printerr ("gdm-runtime-config: unable to set '%s' in '%s' group to '%s': %s", + key, group, value, error->message); + return EX_CANTCREAT; + } + + return EX_OK; +} diff --git a/utils/meson.build b/utils/meson.build index f719c49d..d59f167b 100644 --- a/utils/meson.build +++ b/utils/meson.build @@ -26,14 +26,14 @@ gdm_screenshot = executable('gdm-screenshot', install: true, ) -# gdm-disable-wayland -gdm_disable_wayland_deps = [ +# gdm-runtime-config +gdm_runtime_config_deps = [ glib_dep, ] -gdm_disable_wayland = executable('gdm-disable-wayland', - 'gdm-disable-wayland.c', - dependencies: gdm_disable_wayland_deps, +gdm_runtime_config = executable('gdm-runtime-config', + 'gdm-runtime-config.c', + dependencies: gdm_runtime_config_deps, include_directories: config_h_dir, install: true, install_dir: get_option('libexecdir'), -- cgit v1.2.1