Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-22 14:49:24 +01:00
Code Releases Activity

build: Add DAEMON_ prefix to CONFIGDIR and STORAGEDIR

Browse Source
This commit is contained in:
Marcel Holtmann 2018-09-14 17:58:44 +02:00
parent 1e37ef31fe
commit 2606bc73ad
5 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -63,14 +63,14 @@ if (test "${prefix}" = "NONE"); then
fi fi
if (test "$localstatedir" = '${prefix}/var'); then if (test "$localstatedir" = '${prefix}/var'); then
storagedir="${prefix}/var/lib/iwd" daemon_storagedir="${prefix}/var/lib/iwd"
else else
storagedir="${localstatedir}/lib/iwd" daemon_storagedir="${localstatedir}/lib/iwd"
fi fi
AC_DEFINE_UNQUOTED(STORAGEDIR, "${storagedir}", AC_DEFINE_UNQUOTED(DAEMON_STORAGEDIR, "${daemon_storagedir}",
[Directory for the storage files]) [Directory for the storage files])
AC_DEFINE_UNQUOTED(CONFIGDIR, "/etc/iwd", [Configuration directory]) AC_DEFINE_UNQUOTED(DAEMON_CONFIGDIR, "/etc/iwd", [Configuration directory])
AC_CHECK_HEADERS(linux/types.h linux/if_alg.h) AC_CHECK_HEADERS(linux/types.h linux/if_alg.h)

9
src/knownnetworks.c
View File

@ -369,9 +369,10 @@ bool known_networks_init(void)
return false; return false;
} }
dir = opendir(STORAGEDIR); dir = opendir(DAEMON_STORAGEDIR);
if (!dir) { if (!dir) {
l_info("Unable to open %s: %s", STORAGEDIR, strerror(errno)); l_info("Unable to open %s: %s", DAEMON_STORAGEDIR,
strerror(errno));
l_dbus_unregister_interface(dbus, IWD_KNOWN_NETWORK_INTERFACE); l_dbus_unregister_interface(dbus, IWD_KNOWN_NETWORK_INTERFACE);
return false; return false;
} }
@ -404,8 +405,8 @@ bool known_networks_init(void)
closedir(dir); closedir(dir);
storage_dir_watch = l_fswatch_new(STORAGEDIR, known_networks_watch_cb, storage_dir_watch = l_fswatch_new(DAEMON_STORAGEDIR,
NULL, known_networks_watch_cb, NULL,
known_networks_watch_destroy); known_networks_watch_destroy);
return true; return true;

4
src/main.c
View File

@ -437,9 +437,9 @@ int main(int argc, char *argv[])
l_info("Wireless daemon version %s", VERSION); l_info("Wireless daemon version %s", VERSION);
if (!config_dir) if (!config_dir)
config_dir = CONFIGDIR; config_dir = DAEMON_CONFIGDIR;
config_path = l_strdup_printf("/%s/%s", config_dir, "main.conf"); config_path = l_strdup_printf("%s/%s", config_dir, "main.conf");
iwd_config = l_settings_new(); iwd_config = l_settings_new();
if (!l_settings_load_from_file(iwd_config, config_path)) if (!l_settings_load_from_file(iwd_config, config_path))

4
src/storage.c
View File

@ -183,12 +183,12 @@ char *storage_get_network_file_path(enum security type, const char *ssid)
hex = l_util_hexstring((const unsigned char *) ssid, hex = l_util_hexstring((const unsigned char *) ssid,
strlen(ssid)); strlen(ssid));
path = l_strdup_printf(STORAGEDIR "/=%s.%s", hex, path = l_strdup_printf(DAEMON_STORAGEDIR "/=%s.%s", hex,
security_to_str(type)); security_to_str(type));
l_free(hex); l_free(hex);
} else } else
path = l_strdup_printf(STORAGEDIR "/%s.%s", ssid, path = l_strdup_printf(DAEMON_STORAGEDIR "/%s.%s", ssid,
security_to_str(type)); security_to_str(type));
return path; return path;

2
tools/test-runner.c
View File

@ -1809,7 +1809,7 @@ static void create_network_and_run_tests(const void *key, void *value,
HW_CONFIG_GROUP_SETUP, HW_CONFIG_GROUP_SETUP,
HW_CONFIG_SETUP_IWD_CONF_DIR); HW_CONFIG_SETUP_IWD_CONF_DIR);
if (!iwd_config_dir) if (!iwd_config_dir)
iwd_config_dir = CONFIGDIR; iwd_config_dir = DAEMON_CONFIGDIR;
iwd_pid = start_iwd(iwd_config_dir, wiphy_list, iwd_pid = start_iwd(iwd_config_dir, wiphy_list,
iwd_ext_options); iwd_ext_options);