From d09fb40ae2af720b59e77eea94dc84991f670b5b Mon Sep 17 00:00:00 2001 From: Mario Limonciello Date: Mon, 19 Dec 2022 10:46:36 -0600 Subject: [PATCH] trivial: don't comment out any daemon.conf keys by default It's confusing to an end user if some keys are commented but others aren't. The thought process is: 1) All keys are configured with their default value. 2) Commenting out a key should keep the default value. 3) Modifying a key sets a new value. --- data/daemon.conf | 13 +++++++++---- src/fu-config.c | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/data/daemon.conf b/data/daemon.conf index 5066ce1c2..4dbb02077 100644 --- a/data/daemon.conf +++ b/data/daemon.conf @@ -60,11 +60,16 @@ TrustedUids= # config level. e.g. `vendor-factory-2021q1` HostBkc= -# The EFI system partition (ESP) path used if UDisks is not available -# or if this partition is not mounted at /boot/efi, /boot, or /efi -#EspLocation= +# Override the location used for the EFI system partition (ESP) path. +# This is typically used if UDisks is not available, or was not able to +# automatically identify the location for any reason. +EspLocation= -# these are only required when the SMBIOS or Device Tree data is invalid or missing +# Override values for SMBIOS / Device Tree data on a system. +# These are only required when the SMBIOS or Device Tree data is invalid, +# missing, or to simulate running on another system. +# * Uncomment them to populate blank entries +# * Uncomment them and add values to populate specific entries #Manufacturer= #ProductName= #ProductSku= diff --git a/src/fu-config.c b/src/fu-config.c index 487b9f7ce..6b93925ea 100644 --- a/src/fu-config.c +++ b/src/fu-config.c @@ -192,7 +192,7 @@ fu_config_reload(FuConfig *self, GError **error) } /* get idle timeout */ - idle_timeout = g_key_file_get_int64(keyfile, "fwupd", "IdleTimeout", &error_timeout); + idle_timeout = g_key_file_get_uint64(keyfile, "fwupd", "IdleTimeout", &error_timeout); if (idle_timeout > 0) self->idle_timeout = idle_timeout; else if (error_timeout != NULL)