trivial: Move /etc/fwupd.conf to /etc/fwupd/daemon.conf

This commit is contained in:
Richard Hughes 2017-09-19 11:04:44 +01:00
parent b0aa379300
commit c2af1964b9
10 changed files with 15 additions and 13 deletions

View File

@ -42,7 +42,7 @@ cp $HOME/rpmbuild/RPMS/*/*.rpm .
# run the installed tests
if [ "$CI" = "true" ]; then
sed "s,^EnableTestSuite=.*,EnableTestSuite=true," -i /etc/fwupd.conf
sed "s,^EnableTestSuite=.*,EnableTestSuite=true," -i /etc/fwupd/daemon.conf
mkdir -p /run/dbus
mkdir -p /var
ln -s /var/run /run

View File

@ -5,11 +5,11 @@ set -e
#only enable on installation not upgrade
if [ "$1" = configure ] && [ -z "$2" ]; then
if [ -f /etc/fwupd.conf ]; then
if [ -f /etc/fwupd/daemon.conf ]; then
if [ "$CI" = "true" ]; then
sed "s,^EnableTestSuite=.*,EnableTestSuite=true," -i /etc/fwupd.conf
sed "s,^EnableTestSuite=.*,EnableTestSuite=true," -i /etc/fwupd/daemon.conf
else
echo "To enable test suite, modify /etc/fwupd.conf"
echo "To enable test suite, modify /etc/fwupd/daemon.conf"
fi
fi
fi

View File

@ -4,11 +4,11 @@ set -e
#DEBHELPER#
if [ "$1" = remove -o "$1" = purge ]; then
if [ -f /etc/fwupd.conf ]; then
if [ -f /etc/fwupd/daemon.conf ]; then
if [ "$CI" = "true" ]; then
sed "s,^EnableTestSuite=.*,EnableTestSuite=false," -i /etc/fwupd.conf
sed "s,^EnableTestSuite=.*,EnableTestSuite=false," -i /etc/fwupd/daemon.conf
else
echo "To disable test suite, modify /etc/fwupd.conf"
echo "To disable test suite, modify /etc/fwupd/daemon.conf"
fi
fi
fi

View File

@ -11,7 +11,7 @@ usr/share/man/man1/*
lib/systemd/system/*
var/lib/fwupd
lib/udev/rules.d/*
data/fwupd.conf etc
data/daemon.conf etc/fwupd
debian/fwupd.pkla /var/lib/polkit-1/localauthority/10-vendor.d
usr/lib/*/fwupd-plugins-*/*.so
debian/lintian/fwupd usr/share/lintian/overrides

View File

@ -179,7 +179,7 @@ mkdir -p --mode=0700 $RPM_BUILD_ROOT%{_localstatedir}/lib/fwupd/gnupg
%files -f %{name}.lang
%doc README.md AUTHORS NEWS
%license COPYING
%config(noreplace)%{_sysconfdir}/fwupd.conf
%config(noreplace)%{_sysconfdir}/fwupd/daemon.conf
%dir %{_libexecdir}/fwupd
%{_libexecdir}/fwupd/fwupd
%{_bindir}/dfu-tool

View File

@ -7,8 +7,8 @@ if get_option('enable-tests')
subdir('installed-tests')
endif
install_data(['fwupd.conf'],
install_dir : get_option('sysconfdir')
install_data(['daemon.conf'],
install_dir : join_paths(get_option('sysconfdir'), 'fwupd')
)
install_data(['org.freedesktop.fwupd.metainfo.xml'],

View File

@ -60,7 +60,7 @@ fu_config_get_config_paths (void)
}
/* use sysconfig, and then fall back to /etc */
sysconfdir = g_build_filename (SYSCONFDIR, "fwupd", NULL);
sysconfdir = g_build_filename (FWUPDCONFIGDIR, NULL);
if (g_file_test (sysconfdir, G_FILE_TEST_EXISTS))
g_ptr_array_add (paths, g_steal_pointer (&sysconfdir));
@ -293,7 +293,7 @@ fu_config_load (FuConfig *self, GError **error)
g_ptr_array_set_size (self->remotes, 0);
/* load the main daemon config file */
config_file = g_build_filename (SYSCONFDIR, "fwupd.conf", NULL);
config_file = g_build_filename (FWUPDCONFIGDIR, "daemon.conf", NULL);
g_debug ("loading config values from %s", config_file);
if (!g_key_file_load_from_file (self->keyfile, config_file,
G_KEY_FILE_NONE, error))

View File

@ -137,6 +137,7 @@ executable(
'-DPLUGINDIR="' + plugin_dir + '"',
'-DSYSFSFIRMWAREDIR="/sys/firmware"',
'-DSYSCONFDIR="' + default_sysconfdir + '"',
'-DFWUPDCONFIGDIR="' + join_paths(default_sysconfdir, 'fwupd') + '"',
'-DFU_OFFLINE_DESTDIR=""',
],
install : true,
@ -202,6 +203,7 @@ if get_option('enable-tests')
'-DPLUGINDIR="' + testdatadir_src + '"',
'-DSYSFSFIRMWAREDIR="' + testdatadir_src + '"',
'-DSYSCONFDIR="' + testdatadir_src + '"',
'-DFWUPDCONFIGDIR="' + testdatadir_src + '"',
],
)
test('fu-self-test', e, is_parallel:false)