From 1d0c27590eca1f66d04038eaf2218224df370f42 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 12 Dec 2011 20:04:25 -0600 Subject: [PATCH] ifnet: use SYSCONFDIR not /etc --- src/settings/plugins/ifnet/net_parser.h | 4 ++-- src/settings/plugins/ifnet/net_utils.c | 4 ++-- src/settings/plugins/ifnet/wpa_parser.h | 5 ++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/settings/plugins/ifnet/net_parser.h b/src/settings/plugins/ifnet/net_parser.h index 0411e939ee..5dcc7e253e 100644 --- a/src/settings/plugins/ifnet/net_parser.h +++ b/src/settings/plugins/ifnet/net_parser.h @@ -24,8 +24,8 @@ #include -#define CONF_NET_FILE "/etc/conf.d/net" -#define IFNET_SYSTEM_SETTINGS_KEY_FILE "/etc/NetworkManager/nm-system-settings.conf" +#define CONF_NET_FILE SYSCONFDIR "/conf.d/net" +#define IFNET_SYSTEM_SETTINGS_KEY_FILE SYSCONFDIR "/NetworkManager/nm-system-settings.conf" #define IFNET_KEY_FILE_GROUP "ifnet" gboolean ifnet_init (gchar * config_file); diff --git a/src/settings/plugins/ifnet/net_utils.c b/src/settings/plugins/ifnet/net_utils.c index fc7e283fec..e8e8b39f0f 100644 --- a/src/settings/plugins/ifnet/net_utils.c +++ b/src/settings/plugins/ifnet/net_utils.c @@ -875,8 +875,8 @@ void get_dhcp_hostname_and_client_id (char **hostname, char **client_id) { const char *dhcp_client; - const gchar *dhcpcd_conf = "/etc/dhcpcd.conf"; - const gchar *dhclient_conf = "/etc/dhcp/dhclient.conf"; + const gchar *dhcpcd_conf = SYSCONFDIR "/dhcpcd.conf"; + const gchar *dhclient_conf = SYSCONFDIR "/dhcp/dhclient.conf"; gchar *line = NULL, *tmp = NULL, *contents = NULL; gchar **all_lines; guint line_num, i; diff --git a/src/settings/plugins/ifnet/wpa_parser.h b/src/settings/plugins/ifnet/wpa_parser.h index 7fd77a0560..3a0d377e5c 100644 --- a/src/settings/plugins/ifnet/wpa_parser.h +++ b/src/settings/plugins/ifnet/wpa_parser.h @@ -21,8 +21,11 @@ #ifndef _WPA_PARSER_H #define _WPA_PARSER_H -#define WPA_SUPPLICANT_CONF "/etc/wpa_supplicant/wpa_supplicant.conf" + #include + +#define WPA_SUPPLICANT_CONF SYSCONFDIR "/wpa_supplicant/wpa_supplicant.conf" + void wpa_parser_init (const char *wpa_supplicant_conf); void wpa_parser_destroy (void);